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'.
parent
23e2ff223c
commit
55593beaba
|
@ -243,13 +243,20 @@ may also simplify input method development.")
|
||||||
#~(modify-phases #$phases
|
#~(modify-phases #$phases
|
||||||
(replace 'wrap-with-additional-paths
|
(replace 'wrap-with-additional-paths
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; Make sure 'ibus-setup' runs with the correct
|
;; Make sure 'ibus-setup' and 'ibus-daemon' runs with the
|
||||||
;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
|
;; correct GUIX_PYTHONPATH and GI_TYPELIB_PATH. Wrap
|
||||||
(wrap-program (search-input-file outputs "bin/ibus-setup")
|
;; 'ibus-daemon' is needed because engines spawned by
|
||||||
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
|
;; the daemon need access to those libraries.
|
||||||
|
(for-each
|
||||||
|
(lambda (prog)
|
||||||
|
(wrap-program prog
|
||||||
|
`("GUIX_PYTHONPATH" ":" prefix
|
||||||
|
(,(getenv "GUIX_PYTHONPATH")))
|
||||||
`("GI_TYPELIB_PATH" ":" prefix
|
`("GI_TYPELIB_PATH" ":" prefix
|
||||||
(,(getenv "GI_TYPELIB_PATH")
|
(,(getenv "GI_TYPELIB_PATH")
|
||||||
,(string-append #$output "/lib/girepository-1.0"))))))))))
|
,(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)
|
(inputs (modify-inputs (package-inputs ibus-minimal)
|
||||||
(prepend gtk
|
(prepend gtk
|
||||||
pango
|
pango
|
||||||
|
|
Reference in New Issue