bug#67819: closed ([PATCH] services: xorg: dbus-daemon-wrapper handle guix home directory.)

[GNU bug Tracking System]

Your message dated Fri, 05 Jan 2024 17:19:33 +0100
with message-id <87zfxjeoru.fsf@gnu.org>
and subject line Re: [bug#67819] [PATCH v2] services: xorg: dbus-daemon-wrapper 
handle guix home
has caused the debbugs.gnu.org bug report #67819,
regarding [PATCH] services: xorg: dbus-daemon-wrapper handle guix home 
directory.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
67819: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67819
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: xorg: dbus-daemon-wrapper handle guix home directory.
>
>
>
>
> Date: 
>
> Thu, 14 Dec 2023 11:02:51 +0800
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> >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 <https://bugs.gnu.org/35267>.
>         (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
>
>
>
>
> -- 
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#67819] [PATCH v2] services: xorg: dbus-daemon-wrapper handle guix home
>
>
>
>
> Date: 
>
> Fri, 05 Jan 2024 17:19:33 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> Hi,
>
> Feng Shu <tumashu@163.com> skribis:
>
> >>From e4a5ee8fd8a71782fdc15a8177cd1474e3135d99 Mon Sep 17 00:00:00 2001
> > From: Feng Shu <tumashu@163.com>
> > 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’.
>
>
> --- End Message ---