53/163: gnu: ibus-libpinyin: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 222225e3dcfc91a11f0e2d6708c4fc8625036742
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 00:08:46 2021 -0500

    gnu: ibus-libpinyin: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/ibus.scm (ibus-libpinyin): Delete trailing #t.
    [phases]{wrap-with-additional-paths}: Use the new Guix PYTHONPATH.
---
 gnu/packages/ibus.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index b9e8c3a..f350f06 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -186,22 +186,27 @@ may also simplify input method development.")
                 "1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0"))))
     (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-after 'wrap-program 'wrap-with-additional-paths
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Make sure 'ibus-setup-libpinyin' runs with the correct
              ;; PYTHONPATH and GI_TYPELIB_PATH.
-             (let ((out (assoc-ref outputs "out")))
+             (let ((out (assoc-ref outputs "out"))
+                   (pythonpath (guix-pythonpath inputs)))
                (wrap-program (string-append out 
"/libexec/ibus-setup-libpinyin")
-                 `("PYTHONPATH" ":" prefix
-                   (,(getenv "PYTHONPATH")
+                 `(,pythonpath ":" prefix
+                   (,(getenv pythonpath)
                     ,(string-append (assoc-ref inputs "ibus")
                                     "/lib/girepository-1.0")))
                  `("GI_TYPELIB_PATH" ":" prefix
                    (,(string-append (assoc-ref inputs "ibus")
-                                    "/lib/girepository-1.0"))))
-               #t))))))
+                                    "/lib/girepository-1.0"))))))))))
     (inputs
      `(("ibus" ,ibus)
        ("libpinyin" ,libpinyin)