guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: ibus-anthy: Archaize wrapper.


From: guix-commits
Subject: 01/02: gnu: ibus-anthy: Archaize wrapper.
Date: Fri, 1 Jul 2022 20:06:55 -0400 (EDT)

lilyp pushed a commit to branch master
in repository guix.

commit 421b47624c44cddeb362a5736eef407112c2babe
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Fri Jul 1 21:18:32 2022 +0200

    gnu: ibus-anthy: Archaize wrapper.
    
    This is a follow-up to 39b118776bbbaed049f8bcafa27bde30d9d0b2f6, which
    applied the wrong modernization metaphors.  For more information, see
    <https://issues.guix.gnu.org/52576#16>.
    
    * gnu/packages/ibus.scm (ibus-anthy)[#:phases]<wrap-programs>: Refer to
    outputs by assoc-ref.
---
 gnu/packages/ibus.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 234d4bd75f..3a058c0eac 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -330,16 +330,15 @@ Chinese pinyin input methods.")
        (modify-phases %standard-phases
          (add-after 'install 'wrap-programs
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (for-each (lambda (prog)
-                         (wrap-program (search-input-file
-                                        outputs (string-append "libexec/" 
prog))
-                           `("GUIX_PYTHONPATH" ":" prefix
-                             (,(getenv "GUIX_PYTHONPATH")))
-                           `("GI_TYPELIB_PATH" ":" prefix
-                             (,(getenv "GI_TYPELIB_PATH")
-                              ,(search-input-directory
-                                inputs "lib/girepository-1.0")))))
-                       '("ibus-engine-anthy" "ibus-setup-anthy")))))))
+             (let ((out (assoc-ref outputs "out")))
+               (for-each (lambda (prog)
+                           (wrap-program (string-append out "/libexec/" prog)
+                             `("GUIX_PYTHONPATH" ":" prefix
+                               (,(getenv "GUIX_PYTHONPATH")))
+                             `("GI_TYPELIB_PATH" ":" prefix
+                               (,(getenv "GI_TYPELIB_PATH")
+                                ,(string-append out 
"/lib/girepository-1.0")))))
+                         '("ibus-engine-anthy" "ibus-setup-anthy"))))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")



reply via email to

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