aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorFeng Shu <tumashu@163.com>2023-12-14 11:02:51 +0800
committerLudovic Courtès <ludo@gnu.org>2024-01-05 17:28:54 +0100
commit65af293c3736b2147c0af764414f2efe720e521e (patch)
tree5ffb15badbbd9fecf6c9fb89191491f53cd528f1 /gnu/services
parent5dbfd2db62354d96eb69d30a66422f362688ebbb (diff)
downloadguix-65af293c3736b2147c0af764414f2efe720e521e.tar
guix-65af293c3736b2147c0af764414f2efe720e521e.tar.gz
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
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/xorg.scm15
1 files 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)