guix-commits
[Top][All Lists]
Advanced

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

107/163: gnu: rhythmbox: Wrap with the new Guix PYTHONPATH.


From: guix-commits
Subject: 107/163: gnu: rhythmbox: Wrap with the new Guix PYTHONPATH.
Date: Mon, 25 Jan 2021 02:01:45 -0500 (EST)

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit c611894e79e98f1b7da56dbd5bce7dbec10cf5c4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 23:58:48 2021 -0500

    gnu: rhythmbox: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (rhythmbox)
    [arguments]: Import and use the (guix build python-build-system) module.
    [phases]{python-and-gi-wrap}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/gnome.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b3fd7e0..672ed49 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6161,7 +6161,12 @@ which can read a large number of file formats.")
               "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"))))
    (build-system glib-or-gtk-build-system)
    (arguments
-    `(#:configure-flags
+    `(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %glib-or-gtk-build-system-modules)
+       #:modules ((guix build glib-or-gtk-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+      #:configure-flags
       (list "--enable-lirc"
             "--enable-python"
             "--enable-vala"
@@ -6177,13 +6182,12 @@ which can read a large number of file formats.")
                  (gi-typelib-path   (getenv "GI_TYPELIB_PATH"))
                  (gst-plugin-path   (getenv "GST_PLUGIN_SYSTEM_PATH"))
                  (grl-plugin-path   (getenv "GRL_PLUGIN_PATH"))
-                 (python-path       (getenv "PYTHONPATH")))
+                 (pythonpath        (guix-pythonpath inputs)))
              (wrap-program (string-append out "/bin/rhythmbox")
                `("GI_TYPELIB_PATH"        ":" prefix (,gi-typelib-path))
                `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
                `("GRL_PLUGIN_PATH"        ":" prefix (,grl-plugin-path))
-               `("PYTHONPATH"             ":" prefix (,python-path))))
-           #t)))))
+               `(,pythonpath ":" prefix (,(getenv pythonpath))))))))))
    (propagated-inputs
     `(("dconf" ,dconf)))
    (native-inputs



reply via email to

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