guix-commits
[Top][All Lists]
Advanced

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

54/163: gnu: ibus-anty: Wrap with the new Guix PYTHONPATH.


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

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

commit 37c5df33a6bc5ffaaaff52f6b5a0e4eca24faea4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 00:14:05 2021 -0500

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

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index f350f06..34895f6 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -266,24 +266,28 @@ Chinese pinyin input methods.")
                 "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags
+     '(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %gnu-build-system-modules)
+       #:modules ((guix build gnu-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:configure-flags
        ;; Use absolute exec path in the anthy.xml.
        (list (string-append "--libexecdir=" %output "/libexec"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-programs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (pythonpath (guix-pythonpath inputs)))
                (for-each
                 (lambda (prog)
                   (wrap-program (string-append out "/libexec/" prog)
-                    `("PYTHONPATH" ":" prefix
-                      (,(getenv "PYTHONPATH")))
+                    `(,pythonpath ":" prefix (,(getenv pythonpath)))
                     `("GI_TYPELIB_PATH" ":" prefix
                       (,(getenv "GI_TYPELIB_PATH")
                        ,(string-append out "/lib/girepository-1.0")))))
-                '("ibus-engine-anthy" "ibus-setup-anthy"))
-               #t))))))
+                '("ibus-engine-anthy" "ibus-setup-anthy"))))))))
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("intltool" ,intltool)



reply via email to

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