guix-commits
[Top][All Lists]
Advanced

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

55/163: gnu: ibus-libhangul: Wrap with the new Guix PYTHONPATH.


From: guix-commits
Subject: 55/163: gnu: ibus-libhangul: 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 4fd47b6b4029a0c20d939c4709b9908cda9912c1
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 00:17:13 2021 -0500

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

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 34895f6..62ee5f7 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -738,18 +738,23 @@ hanja dictionary and small hangul character 
classification.")
          "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#: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))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (wrap-program (string-append (assoc-ref outputs "out")
-                                          "/libexec/ibus-setup-hangul")
-               `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
-               `("LD_LIBRARY_PATH" ":" prefix
-                 (,(string-append (assoc-ref inputs "libhangul") "/lib")))
-               `("GI_TYPELIB_PATH" ":" prefix
-                 (,(getenv "GI_TYPELIB_PATH"))))
-             #t)))))
+             (let ((pythonpath (guix-pythonpath inputs)))
+               (wrap-program (string-append (assoc-ref outputs "out")
+                                            "/libexec/ibus-setup-hangul")
+                 `(,pythonpath ":" prefix (,(getenv pythonpath)))
+                 `("LD_LIBRARY_PATH" ":" prefix
+                   (,(string-append (assoc-ref inputs "libhangul") "/lib")))
+                 `("GI_TYPELIB_PATH" ":" prefix
+                   (,(getenv "GI_TYPELIB_PATH"))))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gettext" ,gettext-minimal)



reply via email to

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