111/163: gnu: caribou: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 7c4e1113a54b4d8e58a84f7c7dc9c7d9f79003e4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:06:07 2021 -0500

    gnu: caribou: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (caribou): Delete trailing #t.
    [arguments]: Import and use the (guix build python-build-system) module.
    [phases]{wrap-programs}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/gnome.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c1f8528..200b2a0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7517,7 +7517,12 @@ Evolution (hence the name), but is now used by other 
packages as well.")
                 "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
+     '(#: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))
+       #:phases
        (modify-phases %standard-phases
          (add-before
           'build 'pre-build
@@ -7527,21 +7532,19 @@ Evolution (hence the name), but is now used by other 
packages as well.")
               (substitute* "libcaribou/Makefile"
                 (("--shared-library=libcaribou.so")
                  (string-append "--shared-library="
-                                out "/lib/libcaribou.so")))
-              #t)))
+                                out "/lib/libcaribou.so"))))))
          (add-after 'install 'wrap-programs
-          (lambda* (#:key outputs #:allow-other-keys)
+          (lambda* (#:key inputs outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
-                   (python-path (getenv "PYTHONPATH"))
+                   (pythonpath (guix-pythonpath inputs))
                    (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
               (for-each
                (lambda (prog)
                  (wrap-program prog
-                   `("PYTHONPATH"      ":" prefix (,python-path))
+                   `(,pythonpath       ":" prefix (,(getenv pythonpath)))
                    `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
                (list (string-append out "/bin/caribou-preferences")
-                     (string-append out "/libexec/antler-keyboard"))))
-            #t)))))
+                     (string-append out "/libexec/antler-keyboard")))))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
        ("gobject-introspection" ,gobject-introspection)