From patchwork Fri Jul 28 12:51:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guix--- via Guix-patches via X-Patchwork-Id: 52320 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7466427BBE9; Fri, 28 Jul 2023 14:11:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E30A127BBE2 for ; Fri, 28 Jul 2023 14:11:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPMy1-0006iT-FP; Fri, 28 Jul 2023 08:53:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPMxt-0006du-Ih for guix-patches@gnu.org; Fri, 28 Jul 2023 08:53:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPMxs-0006WS-Fs for guix-patches@gnu.org; Fri, 28 Jul 2023 08:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPMxq-0008F4-0R; Fri, 28 Jul 2023 08:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64918] [PATCH 1/3] gnu: ibus: Wrap daemon with libraries for engines Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 12:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64918@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 64918-submit@debbugs.gnu.org id=B64918.169054874831611 (code B ref 64918); Fri, 28 Jul 2023 12:53:01 +0000 Received: (at 64918) by debbugs.gnu.org; 28 Jul 2023 12:52:28 +0000 Received: from localhost ([127.0.0.1]:44095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPMxI-0008Dn-E8 for submit@debbugs.gnu.org; Fri, 28 Jul 2023 08:52:28 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPMxG-0008Da-Gr for 64918@debbugs.gnu.org; Fri, 28 Jul 2023 08:52:27 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C7A3741C95; Fri, 28 Jul 2023 14:52:22 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xB03JyR295fW; Fri, 28 Jul 2023 14:52:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690548741; bh=jP0ZKt869TkLdklYCF4xw8TUWnlpG9oCGiWp9NSbfFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dheG87dCtBLaxhJBXQql7hM9JOTwSOGIxN22YtU0ycJNvEI472Flmo/DE3wP0MQ14 SHMUfA5tVcwfH/5pQX4lWgsJ8Gu8LREbml1j3LtEhqsMAHY3MIHTo16NYlHQRL1yWq wY2wJNpigH7tjphcudC53e8ddTIBfN9rKuNXM9xtEMrVp3J9USxZOqoKScWppnVhAF J7V8grNXZ01SfFXvsHlzvHU7WaIgafOmyK8pJNj0u+YByd9LaUAsJhvQ0dZQsBXkW5 9l4NBreSiS8hOBUn0En8vTS5uTSPU9ggAWye4oFwPVdJilyMwZb2Kugk0Pc5V+3ul+ O0UobQMdCsL7Q== Date: Fri, 28 Jul 2023 21:51:57 +0900 Message-ID: <269b3133dc524aa0b8a46d3da4ae91a6b67b8c90.1690548388.git.mcsinyx@disroot.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: guix--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * 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