From: guix-patches--- via <guix-patches@gnu.org>
To: 64918@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>, "Zhu Zihao" <all_but_last@163.com>,
宋文武 <iyzsong@envs.net>
Subject: [bug#64918] [PATCH 1/3] gnu: ibus: Wrap daemon with libraries for engines
Date: Fri, 28 Jul 2023 21:51:57 +0900 [thread overview]
Message-ID: <269b3133dc524aa0b8a46d3da4ae91a6b67b8c90.1690548388.git.mcsinyx@disroot.org> (raw)
In-Reply-To: <cover.1690548388.git.mcsinyx@disroot.org>
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/ibus.scm (ibus): Wrap ibus-daemon with GUIX_PYTHONPATH
and GI_TYPELIB_PATH to be used by engines spawned by it.
---
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 e9294fab1ee5..435960c5729a 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -243,13 +243,20 @@ (define-public ibus
#~(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
--
2.41.0
next prev parent reply other threads:[~2023-07-28 13:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 12:48 [bug#64918] [PATCH 0/3] gnu: Add ibus-table{,-others} guix-patches--- via
2023-07-28 12:51 ` guix-patches--- via [this message]
2023-07-28 12:51 ` [bug#64918] [PATCH 2/3] gnu: Add ibus-table guix-patches--- via
2023-07-28 12:51 ` [bug#64918] [PATCH 3/3] gnu: Add ibus-table-others guix-patches--- via
2023-08-03 10:30 ` bug#64918: [PATCH 0/3] gnu: Add ibus-table{,-others} 宋文武 via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=269b3133dc524aa0b8a46d3da4ae91a6b67b8c90.1690548388.git.mcsinyx@disroot.org \
--to=guix-patches@gnu.org \
--cc=64918@debbugs.gnu.org \
--cc=all_but_last@163.com \
--cc=iyzsong@envs.net \
--cc=iyzsong@member.fsf.org \
--cc=mcsinyx@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.