From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:52699) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmZc3-0003om-Lo for guix-patches@gnu.org; Sun, 14 Jul 2019 04:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmZc2-00027l-Is for guix-patches@gnu.org; Sun, 14 Jul 2019 04:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hmZc2-00027X-Ea for guix-patches@gnu.org; Sun, 14 Jul 2019 04:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hmZc2-0007ex-8S for guix-patches@gnu.org; Sun, 14 Jul 2019 04:12:02 -0400 Subject: bug#36641: [PATCH] gnu: python-gst: Fix build failure. Resent-To: guix-patches@gnu.org Resent-Message-ID: References: <20190713220059.7336-1-mail@cbaines.net> <87muhhlf8k.fsf@devup.no> From: Christopher Baines In-reply-to: <87muhhlf8k.fsf@devup.no> Date: Sun, 14 Jul 2019 09:11:36 +0100 Message-ID: <87tvbp3uiv.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 36641-done@debbugs.gnu.org --=-=-= Content-Type: text/plain Marius Bakke writes: > Christopher Baines writes: > >> Building python-gst fails with: >> >> Unbound variable: python-version >> >> Therefore, add python-build-system to #:modules so that it's imported, and >> give it a prefix to avoid clashing with the gnu-build-system. >> >> Also, simplify the code by using the site-packages function from the >> python-build-system module. >> >> * gnu/packages/gstreamer.scm (python-gst)[arguments]: Rework to fix build >> failure. >> --- >> gnu/packages/gstreamer.scm | 15 ++++++--------- >> 1 file changed, 6 insertions(+), 9 deletions(-) >> >> diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm >> index b0f0b032b3..efb9a6f796 100644 >> --- a/gnu/packages/gstreamer.scm >> +++ b/gnu/packages/gstreamer.scm >> @@ -431,17 +431,14 @@ compression formats through the use of the libav library.") >> "0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m")))) >> (build-system gnu-build-system) >> (arguments >> - ;; XXX: Factorize python-sitedir with python-build-system. >> - `(#:imported-modules (,@%gnu-build-system-modules >> + `(#:modules ((guix build gnu-build-system) >> + ((guix build python-build-system) #:prefix python:)) >> + #:imported-modules (,@%gnu-build-system-modules >> (guix build python-build-system)) >> #:configure-flags >> - (let* ((python (assoc-ref %build-inputs "python")) >> - (python-version (python-version python)) >> - (python-sitedir (string-append >> - "lib/python" python-version "/site-packages"))) >> - (list (string-append >> - "--with-pygi-overrides-dir=" %output "/" python-sitedir >> - "/gi/overrides"))))) >> + (list (string-append >> + "--with-pygi-overrides-dir=" %output "/" > > Nitpicking, but since we're refactoring, could you also change %output > to the less magical (assoc-ref %outputs "out")? Actually, turns out that most of the stuff there was redundant. python:site-packages did more than I was expecting, so I've removed the use of %output entirely. >> + (python:site-packages %build-inputs %outputs) "/gi/overrides")))) > > Neat! LGTM. Great, I've pushed this now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl0q47hfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfVjg/+KNDFFdZurDTj1Vr7Kt568V/YZ0lIgVQIHIwjlSTYbRDi1iIyP4rfd4zo JLkIktwihoLkPvAFlGNqck+F7G+KnXKfw4zomsQnqFif9QM+PkdJak3rjBMOxcRu KPhGHZmWPmzytok9dccxrS4ilPE4bPlNfnWXTP4mBQpGFv2hwfvo8sYSHnCI2H2a K7+L26GzzFB5a5Mj6jj+0cJzukh9JC3GEGfC7aIVnSc5RaF2D6J4w6BVBvVYv1Za cS1DXSzlInODFN0bvZD+82y/G++s35SWsEnI31jncQGyriZ1A+ih8qPwXoyWUBJl R0aeMCNJilVTzMry6jCNmjibLXQHBd5452tggsAwa2nB+Lqu9q10ZrhTUBzuP6qR V/7cY67ftcy9v+XfakzQq4mfBWGRLsurztgHD9Fox4tlnk6xlUrHZZfKJmyTc/7K 2OBaPDM189rEonEBc301ULyKznKmeUfzHz3D6W6lbPb2UD4tGcVSbm8VmrYLk/yf nD+Otu9jZm0tHj2eY6Dmf/byNyqOOGGDYOGI4AoDV7m/PDkKTokaez+1StIzeLZU ooqJrJeG4kTBcnpC5Y0ju0qfCrvLpfEOKgNuPOolmN+PK4Ie7YAg9FgumdsFI1U+ 0NMImrKubw6fPcDH4XHuUBhFWIgPwN7XmO/EhpWqi12yrtl7yn4= =3GLL -----END PGP SIGNATURE----- --=-=-=--