From patchwork Thu Dec 14 03:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 57589 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 A49B027BBEA; Thu, 14 Dec 2023 03:11:00 +0000 (GMT) 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,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 5F19427BBE2 for ; Thu, 14 Dec 2023 03:10:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDc7b-0005dn-SB; Wed, 13 Dec 2023 22:10:47 -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 1rDc7Z-0005dW-P8 for guix-patches@gnu.org; Wed, 13 Dec 2023 22:10:45 -0500 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 1rDc7Z-0006dd-Gi for guix-patches@gnu.org; Wed, 13 Dec 2023 22:10:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDc7p-0003a7-Pp for guix-patches@gnu.org; Wed, 13 Dec 2023 22:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67819] [PATCH] services: xorg: dbus-daemon-wrapper handle guix home directory. Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 03:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67819@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.170252342113717 (code B ref -1); Thu, 14 Dec 2023 03:11:01 +0000 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 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 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-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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"