[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: services: xorg: ‘dbus-daemon-wrapper’ handles Home profile.
From: |
guix-commits |
Subject: |
06/07: services: xorg: ‘dbus-daemon-wrapper’ handles Home profile. |
Date: |
Fri, 5 Jan 2024 11:30:26 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 65af293c3736b2147c0af764414f2efe720e521e
Author: Feng Shu <tumashu@163.com>
AuthorDate: Thu Dec 14 11:02:51 2023 +0800
services: xorg: ‘dbus-daemon-wrapper’ handles Home profile.
* gnu/services/xorg.scm (dbus-daemon-wrapper): Handle Home profile.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: Ib2f2330b7ea017ddf33d636de71aaa1c316808cb
---
gnu/services/xorg.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index f8cf9f25b6..1ee15ea90c 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -981,6 +981,11 @@ argument.")))
(lambda (pw)
(string-append (passwd:dir pw) "/.guix-profile"))))
+ (define 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
@@ -988,9 +993,13 @@ argument.")))
;; 'evolution') to work even if those services are only available
;; in the user's profile. See <https://bugs.gnu.org/35267>.
(define profiles
- (if user-profile
- (list user-profile system-profile)
- (list system-profile)))
+ (append (if home-profile
+ (list home-profile)
+ '())
+ (if user-profile
+ (list user-profile)
+ '())
+ (list system-profile)))
(setenv "XDG_CONFIG_DIRS"
(string-join (map (cut string-append <> "/etc/xdg") profiles)
- branch master updated (5cec983e04 -> 5279bd453f), guix-commits, 2024/01/05
- 01/07: services: shepherd: Remove ‘dynamic-wind’ in ‘call-with-*-file’., guix-commits, 2024/01/05
- 05/07: gnu: Add guile-srfi-133., guix-commits, 2024/01/05
- 03/07: ui: It’s 2024 now!, guix-commits, 2024/01/05
- 02/07: teams: Add ‘core-packages’ team., guix-commits, 2024/01/05
- 04/07: daemon: Change default ‘timeout’ and ‘max-silent-time’ values., guix-commits, 2024/01/05
- 07/07: gnu: Add guile-srfi-232., guix-commits, 2024/01/05
- 06/07: services: xorg: ‘dbus-daemon-wrapper’ handles Home profile.,
guix-commits <=