[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: python-gst: Fix build failure.

From: guix-commits
Subject: 02/02: gnu: python-gst: Fix build failure.
Date: Sun, 14 Jul 2019 04:09:28 -0400 (EDT)

cbaines pushed a commit to branch core-updates
in repository guix.

commit a5c2e7961c21ef8620ce4cfb3569109fbd694e1e
Author: Christopher Baines <address@hidden>
Date:   Sat Jul 13 22:58:33 2019 +0100

    gnu: python-gst: Fix build failure.
    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
 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 b0f0b03..18c567e 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -431,17 +431,14 @@ compression formats through the use of the libav 
     (build-system gnu-build-system)
-     ;; 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))
-       (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="
+              (python:site-packages %build-inputs %outputs) "gi/overrides"))))
      `(("pkg-config" ,pkg-config)
        ("python" ,python)))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]