From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 22:10:21 2023 Received: (at submit) by debbugs.gnu.org; 14 Dec 2023 03:10:21 +0000 Received: from localhost ([127.0.0.1]:59974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDc7B-0003ZB-By for submit@debbugs.gnu.org; Wed, 13 Dec 2023 22:10:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDc77-0003Yq-Ih for submit@debbugs.gnu.org; Wed, 13 Dec 2023 22:10:20 -0500 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 1rDc6l-0005Zv-Db for guix-patches@gnu.org; Wed, 13 Dec 2023 22:09:55 -0500 Received: from m15.mail.163.com ([45.254.50.220]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDc6h-0006Mm-4m for guix-patches@gnu.org; Wed, 13 Dec 2023 22:09:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=RCihPpDZ2KtQ1uBHR/w3oXfi0xiWEuZWa0cpA4o23Uo=; b=OKWdcW+agiFplvW36P7a/1rfx003jiiBfFbbNKKn4Gdsf95USAA8MZeDb4/Oer CTMcjrpOBYbn1pXmqhIo21isVL0eAqMzfPSB0dpNvIfIUN4g9X9cVkUKKpf273Mn v9zpg3u3j9IG9lawMt0nAQRTbqjI1ggOwa4HH358TvpeA= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g2-1 (Coremail) with SMTP id _____wDHzqj4cXplcyRpFg--.20283S2; Thu, 14 Dec 2023 11:09:44 +0800 (CST) From: Feng Shu To: "guix-patches" Subject: [PATCH] services: xorg: dbus-daemon-wrapper handle guix home directory. Date: Thu, 14 Dec 2023 11:02:51 +0800 Message-ID: <87il517a4n.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-CM-TRANSID: _____wDHzqj4cXplcyRpFg--.20283S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Jw47uF4UZrWfGw1kCw1rWFg_yoW8Jr47pF 1Fkry7Krn5XwnxGr18XF1UGF1aq3yrArn5uan7ur98A34kGrWqqF12y3yfJFWDWws3Cw45 XryrAryrur4UZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07URq2_UUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiwBRG1FXlxirm5gABsb Received-SPF: pass client-ip=45.254.50.220; envelope-from=tumashu@163.com; helo=m15.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) >From 1b8047ebb18d52923950f988adf612b251b39107 Mon Sep 17 00:00:00 2001 * gnu/services/xorg.scm (dbus-daemon-wrapper): Handle guix home directory. --- gnu/services/xorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 9235295dd6..56d3c737d9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -987,6 +987,11 @@ (define user-profile (lambda (pw) (string-append (passwd:dir pw) "/.guix-profile")))) + (define guix-home-profile + (and=> (getpw (getuid)) + (lambda (pw) + (string-append (passwd:dir pw) "/.guix-home/profile")))) + ;; If we are able to find the user's profile, we can add it to ;; the search paths set below. We need to do this so that D-Bus ;; can start services installed by the user. This allows @@ -995,7 +1000,9 @@ (define user-profile ;; in the user's profile. See . (define profiles (if user-profile - (list user-profile system-profile) + (if guix-home-profile + (list user-profile guix-home-profile system-profile) + (list user-profile system-profile)) (list system-profile))) (setenv "XDG_CONFIG_DIRS" -- 2.39.2 -- From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 14 19:35:49 2023 Received: (at 67819) by debbugs.gnu.org; 15 Dec 2023 00:35:49 +0000 Received: from localhost ([127.0.0.1]:51229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwBA-0004Lb-Rz for submit@debbugs.gnu.org; Thu, 14 Dec 2023 19:35:49 -0500 Received: from m15.mail.163.com ([45.254.50.219]:35400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDwB7-0004LP-5N for 67819@debbugs.gnu.org; Thu, 14 Dec 2023 19:35:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=3L2F6CL5a6623/yhZjpI7+uhq6n4wLaOzlcZXGXa1aM=; b=A2an31OEYfYRymNhoBClDQh3GPnehtPonM4xF85ce1ZSm4a/UhWTtWD3n1rOoe FpmtN70fz26eKAxhNL2pOfRaSshcOp3mPrdGUAKVS4Vj03/JHKCeUmqDfzMjM2Yx ZY74RJBSTDI+qge5U+k0EBue/I8a3eKzs5EDSGHQbnz+8= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g2-0 (Coremail) with SMTP id _____wBnTTFan3tlXyjeFg--.41169S2; Fri, 15 Dec 2023 08:35:38 +0800 (CST) From: Feng Shu To: 67819@debbugs.gnu.org Subject: [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home Date: Fri, 15 Dec 2023 08:35:38 +0800 Message-ID: <87r0jos3ol.fsf@163.com> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=v2-0001-services-xorg-dbus-daemon-wrapper-handle-guix-hom.patch Content-Description: [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home X-CM-TRANSID: _____wBnTTFan3tlXyjeFg--.41169S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU4_HUUUUUU X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiwB5H1FXlxjtTUAAAsD X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67819 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From e4a5ee8fd8a71782fdc15a8177cd1474e3135d99 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Thu, 14 Dec 2023 11:02:51 +0800 Subject: [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home directory. * gnu/services/xorg.scm (dbus-daemon-wrapper): Handle guix home directory. --- gnu/services/xorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 9235295dd6..56d3c737d9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -987,6 +987,11 @@ (define user-profile (lambda (pw) (string-append (passwd:dir pw) "/.guix-profile")))) + (define guix-home-profile + (and=> (getpw (getuid)) + (lambda (pw) + (string-append (passwd:dir pw) "/.guix-home/profile")))) + ;; If we are able to find the user's profile, we can add it to ;; the search paths set below. We need to do this so that D-Bus ;; can start services installed by the user. This allows @@ -995,7 +1000,9 @@ (define user-profile ;; in the user's profile. See . (define profiles (if user-profile - (list user-profile system-profile) + (if guix-home-profile + (list user-profile guix-home-profile system-profile) + (list user-profile system-profile)) (list system-profile))) (setenv "XDG_CONFIG_DIRS" -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 05 11:20:22 2024 Received: (at 67819-done) by debbugs.gnu.org; 5 Jan 2024 16:20:22 +0000 Received: from localhost ([127.0.0.1]:57673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLmvl-0000jc-Qv for submit@debbugs.gnu.org; Fri, 05 Jan 2024 11:20:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLmvk-0000jQ-8S for 67819-done@debbugs.gnu.org; Fri, 05 Jan 2024 11:20:20 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLmvW-0003j9-PO; Fri, 05 Jan 2024 11:20:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=7rRFxKIl6iRdIpA0JxkPDCRrk7DzmsYKeEc6UNJjUmA=; b=pS+Lec8i+ki5MDWJkVmG rPTfFp6emKYoRMqkWCwLCCEfvCoL/HohRP/jAc9V+xQjrFrUdG105VoBhDRCdjDRwA0nhYfmBchcY +KJGSpU7+Ar5MALSCt3h4TaqlddSVoGhq/4P0tdclAGEg97z66b7wkQzSKW2KK6JTBTNe2Q1TDTgJ b8330cooVTbnc2KKmH2WGEQ7kwKCDcADCTm/+idD3vWwTE0W9fNU2bvGyQO/cgCdyCrm7uLDe4JsU H9TfRfmtdZcOw5Y1Dliqx1AAfBXJ7J2SdVTh/36qp1mV1w91ul0duNEkqc7l0zsjlZ2iN28cacrp2 75/a1rp6pp6YHQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Feng Shu Subject: Re: [bug#67819] [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home In-Reply-To: <87r0jos3ol.fsf@163.com> (Feng Shu's message of "Fri, 15 Dec 2023 08:35:38 +0800") References: <87il517a4n.fsf@163.com> <87r0jos3ol.fsf@163.com> Date: Fri, 05 Jan 2024 17:19:33 +0100 Message-ID: <87zfxjeoru.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 67819-done Cc: 67819-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Feng Shu skribis: >>>From e4a5ee8fd8a71782fdc15a8177cd1474e3135d99 Mon Sep 17 00:00:00 2001 > From: Feng Shu > Date: Thu, 14 Dec 2023 11:02:51 +0800 > Subject: [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home > directory. > > * gnu/services/xorg.scm (dbus-daemon-wrapper): Handle guix home directory. Good idea. > (define profiles > (if user-profile > - (list user-profile system-profile) > + (if guix-home-profile > + (list user-profile guix-home-profile system-profile) > + (list user-profile system-profile)) > (list system-profile))) I tweaked for clarity: (define profiles (append (if home-profile (list home-profile) '()) (if user-profile (list user-profile) '()) (list system-profile))) Applied, thanks! Ludo=E2=80=99. From unknown Thu Sep 11 17:28:38 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 03 Feb 2024 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator