iyzsong pushed a commit to branch master
in repository guix.
commit 55593beaba8328c16e3b1fa81197f4173fc17691
Author: 宋文武 <[email protected]>
AuthorDate: Fri Jul 28 21:51:57 2023 +0900
gnu: ibus: Wrap ibus-daemon with GUIX_PYTHONPATH and GI_TYPELIB_PATH.
* gnu/packages/ibus.scm (ibus)[arguments]: Wrap 'ibus-daemon' in the same
way as 'ibus-setup'.
---
gnu/packages/ibus.scm | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index b156e2ab58..1182b6ba69 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -243,13 +243,20 @@ may also simplify input method development.")
#~(modify-phases #$phases
(replace 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure 'ibus-setup' runs with the correct
- ;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
- (wrap-program (search-input-file outputs "bin/ibus-setup")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
- `("GI_TYPELIB_PATH" ":" prefix
- (,(getenv "GI_TYPELIB_PATH")
- ,(string-append #$output "/lib/girepository-1.0"))))))))))
+ ;; Make sure 'ibus-setup' and 'ibus-daemon' runs with the
+ ;; correct GUIX_PYTHONPATH and GI_TYPELIB_PATH. Wrap
+ ;; 'ibus-daemon' is needed because engines spawned by
+ ;; the daemon need access to those libraries.
+ (for-each
+ (lambda (prog)
+ (wrap-program prog
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,(getenv "GI_TYPELIB_PATH")
+ ,(string-append #$output "/lib/girepository-1.0")))))
+ (list (search-input-file outputs "bin/ibus-setup")
+ (search-input-file outputs "bin/ibus-daemon")))))))))
(inputs (modify-inputs (package-inputs ibus-minimal)
(prepend gtk
pango
