From patchwork Sun Dec 6 06:15:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5a6L5paH5q2m?= X-Patchwork-Id: 25608 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 1281227BC02; Sun, 6 Dec 2020 16:42:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1496C27BC00 for ; Sun, 6 Dec 2020 16:42:14 +0000 (GMT) Received: from localhost ([::1]:42336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klx6z-0000sG-4k for patchwork@mira.cbaines.net; Sun, 06 Dec 2020 11:42:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klx5x-0000PZ-UM for guix-patches@gnu.org; Sun, 06 Dec 2020 11:41:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klx5u-00005Z-2m for guix-patches@gnu.org; Sun, 06 Dec 2020 11:41:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klx5u-0006ft-1G for guix-patches@gnu.org; Sun, 06 Dec 2020 11:41:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45064] [PATCH 2/2] profiles: gtk-im-modules: Set environment variables for input methods. Resent-From: iyzsong@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Dec 2020 16:41:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45064 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45064@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 45064-submit@debbugs.gnu.org id=B45064.160727283525487 (code B ref 45064); Sun, 06 Dec 2020 16:41:05 +0000 Received: (at 45064) by debbugs.gnu.org; 6 Dec 2020 16:40:35 +0000 Received: from localhost ([127.0.0.1]:51022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klx5P-0006cv-7o for submit@debbugs.gnu.org; Sun, 06 Dec 2020 11:40:35 -0500 Received: from mail-oln040092254053.outbound.protection.outlook.com ([40.92.254.53]:6116 helo=APC01-PU1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klnKE-00035C-LD for 45064@debbugs.gnu.org; Sun, 06 Dec 2020 01:15:20 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KayVK+6ROWNUB3GGA7l83KEPRQGofKXrc8SdsiR6Eno+DvW/4Ji9Jnd7YCTalPN2nGsqhNWo3UIIzz6QV3JrO5QcEsMdY9gcMEkyjT5eYmyj423H2dZMsBKc52Hbr13Z7m0XrTuBEDyMrJmNd9Nlluq9Q6djkQl5Y8jHeKVVVIesYwNcBtEsC001zUdlgkZbvhUP1hN7K1vQ3QyWY19W642XlgR2xRrWtbS50P8PEaUBtJIreY42NdbHfAkq4oHA92IAmauAOKYhNNr6bh/7QcW3uV39vmJHVXTktJxzFwEpETk/wysEE0Se1jQoo7aV9uo+5YEipjEt3lXBMf6v9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bwhA00lS4TJbqdl84Dpv7Sp+T1I7NbuKm0dXhMthMR8=; b=md4kMH2Qz4q8g1vlE6ibwGdJ8uEwYBpaaMbxADchTXfm8aHdgSNqUb1sy7meymkdCfq5e60py6SkZfvZNrYGdJwOERcd/XQbZYOLzo0jswEQPWGL1GxBpk1S4vP79WE7dS9ZSAvJklFbUxbGjq/Nt9rcj2JpWyACaYRQdf+uthhW5AVuNvjYRotvuhlODMUL/nPU706CnpkpvNq9rlo7LyEfdRhOa/SpGG6L9cTt5xSdPHS9PBuLklped1NIYetdOhVtzJdFg88w/j3pcTWrmghGTAsdVu4XdG21mCSFqnsTxTNLALxo3OahKCLnY+PE+nrFowOun1KX4BqMoKQQbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bwhA00lS4TJbqdl84Dpv7Sp+T1I7NbuKm0dXhMthMR8=; b=F+kUguscY6cjp5pz/zd/JRM8XjJfwX7wUFAx9x3eSR/9TrTxmw1bSrGxrIyzwtr5CCkITSlvgQBfs4uNMWa3mKf5jcvq32maWkRQahtI3wcASWpUKNqKM26TgpPx7m2xE6iBw+CLbKWLA0jH0q9pNPqjxWbqdtEFMsE2Th9HL4rSi8wtF6yuv+zXlzpTakUv34tLqtxthCWxIDvGFNh//TAxwpwMTchMEAA3LQhiJwPz2ct5wLWolhnjhLSaqL0Tn0F0ABug2VMVcsCnhFtW6drxmmnLTIO++U6h0G69zRdQbyeroioKAQUuEFJzlf1SKgjTa6sv1WM3nYKkQn0ETQ== Received: from HK2APC01FT046.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::49) by HK2APC01HT164.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::434) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17; Sun, 6 Dec 2020 06:15:04 +0000 Received: from TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM (2a01:111:e400:7ebc::53) by HK2APC01FT046.mail.protection.outlook.com (2a01:111:e400:7ebc::436) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Sun, 6 Dec 2020 06:15:04 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E9C403F734E532898D2F44084E2C0AA34AF563170F17DCAF3FFA14E5F296C499; UpperCasedChecksum:4B77DA5E37873DF32233361176DCE4A348D26CBB4E9C5E7FF3F65A62D646694B; SizeAsReceived:8665; Count:47 Received: from TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM ([fe80::d802:80c9:f6bd:1fbb]) by TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM ([fe80::d802:80c9:f6bd:1fbb%8]) with mapi id 15.20.3632.017; Sun, 6 Dec 2020 06:15:04 +0000 From: iyzsong@outlook.com Date: Sun, 6 Dec 2020 14:15:15 +0800 Message-ID: X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201206061515.10449-1-iyzsong@outlook.com> References: <20201206061515.10449-1-iyzsong@outlook.com> X-TMN: [S5+kepw81Uxt78nbYPrglPMhryFkmUvJpIQM2fz7qFU22GytxqHF+nN5obxeuibm] X-ClientProxiedBy: BYAPR07CA0104.namprd07.prod.outlook.com (2603:10b6:a03:12b::45) To TYAP286MB0185.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8038::14) X-Microsoft-Original-Message-ID: <20201206061515.10449-2-iyzsong@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:372:3600:2f1:f5ff:fe18:6bb) by BYAPR07CA0104.namprd07.prod.outlook.com (2603:10b6:a03:12b::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.18 via Frontend Transport; Sun, 6 Dec 2020 06:15:03 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8ab26230-b5b0-4c26-a9e3-08d899ae456b X-MS-TrafficTypeDiagnostic: HK2APC01HT164: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8qqOgc4G8s5R7sumRKQtgcfe5FXOQlj4tXl5gfxuL9rzGQhPZhQ3C+EwTpiC75oGzm6o21zaH+YD5cVJiMyKALfaXPxZwPODw814iFybzqEQqViEkzEsJOPBhJFv0SXoYVYKzE7KNN44ELskb8tmTGtxKfjfV0868j2Bed4IG+hIMX3/COqsyXWNqUq8iy40oTKkAP1zlDxfSB67HKI0xQ== X-MS-Exchange-AntiSpam-MessageData: Ydko/iDe2MPZFSwdLxnPihi7hxHxCcJA1uXvnVWsk1A5pTQgFI/CReQGNjT8EumYKKCJKVMh3xxS4WjQ4eHQvF3ux/H5sVDj6rA2rf9kiuOBhZIW0BmX7v4UaMdX4JMuBDMQ/ftW1HIM2rnnKMJz8OKMeGSsu4Fs+m0U0972Ls0mJPEJUlJba0vZLLfctlmYfQUb0XuFXm6EcEqQVpOmlA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab26230-b5b0-4c26-a9e3-08d899ae456b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2020 06:15:04.3656 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT046.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT164 X-Mailman-Approved-At: Sun, 06 Dec 2020 11:40:33 -0500 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * guix/profiles.scm (gtk-im-modules): Set 'GUIX_GTK2_IM_MODULE_FILE' and 'GUIX_GTK3_IM_MODULE_FILE' via profile startup files. --- guix/profiles.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 1b15257210..c998329e8a 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1151,7 +1151,10 @@ for both major versions of GTK+." (map (cut string-append <> prefix "/immodules") '#$(manifest-inputs manifest))))) (modules (append-map (cut find-files <> "\\.so$") - moddirs))) + moddirs)) + (im-env (string-append "GUIX_GTK" #$major "_IM_MODULE_FILE")) + (envfile (string-append #$output "/etc/profile.d/gtk" + #$major "-im-modules.sh"))) ;; Generate a new immodules cache file. (mkdir-p (string-append #$output prefix)) @@ -1167,7 +1170,12 @@ for both major versions of GTK+." (write-char (read-char pipe) out)))) #t) (lambda () - (close-pipe pipe))))))))) + (close-pipe pipe))) + ;; Set environment variable for GTK+ input method modules. + (mkdir-p (dirname envfile)) + (with-output-to-file envfile + (lambda () + (simple-format #t "export ~a=~a\n" im-env outfile))))))))) ;; Don't run the hook when there's nothing to do. (let* ((pkg-gtk+ (module-ref ; lazy reference