Subject: bug#35641: closed (Re: [bug#35641] [PATCH] services: gdm: Include user profile in D-Bus paths.)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 11 May 2019 17:46:02 +0000

Your bug report

#35641: [PATCH] services: gdm: Include user profile in D-Bus paths.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
35641: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=35641
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#35641] [PATCH] services: gdm: Include user profile in D-Bus paths.
From: Timothy Sample <[email-masked]>
To: Ludovic Courtès <[email-masked]>
Cc: [email-masked]
Date: Sat, 11 May 2019 13:45:29 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Ludo,

Ludovic Courtès <[email-masked]> writes:

> Timothy Sample <[email-masked]> skribis:
>
> [...]
>
>> Is it okay to assume that “.guix-profile” is the user’s profile like
>> this?  If it isn’t okay in general, is it okay enough for now?
>
> In this particular case, I’d say it’s OK.
>
> Do we have any other option on the table anyway?

We could run D-Bus from a login shell.  The reason I didn’t opt for this
is that GDM launches D-Bus from a stripped-down environment.  It’s not
clear to me if there’s a reason for doing so, or if it was just the way
the code came together.  Essentially, I’m trying to be conservative.

I’m still holding out hope that a future “user sessions” feature in Guix
will make all of these hacks go away.  :)

>>>>From e32c27dfa950d250520c3c8ecccba90add863639 Mon Sep 17 00:00:00 2001
>> From: Timothy Sample <[email-masked]>
>> Date: Wed, 8 May 2019 09:13:14 -0400
>> Subject: [PATCH] services: gdm: Include user profile in D-Bus paths.
>>
>> This partially addresses <https://bugs.gnu.org/35267>.
>>
>> * gnu/services/xorg.scm (dbus-daemon-wrapper): When '$HOME' is set,
>> include directories from '$HOME/.guix-profile' in the search paths of
>> the D-Bus daemon.
>
> [...]
>
>> +  (program-file
>> +   "gdm-dbus-wrapper"
>> +   #~(begin
>> +       (use-modules (srfi srfi-26))
>
> Same thing with a few comment explaining what you wrote above would be
> great.
>
> LGTM!

I pushed a nicer version (following the style of the “xinitrc” code)
with a long comment as dcb3a0fe0a086b4762a721e9b1da64826d5160d0.

Thanks for the review!

-- Tim

Subject: [PATCH] services: gdm: Include user profile in D-Bus paths.
From: Timothy Sample <[email-masked]>
To: [email-masked]
Date: Wed, 08 May 2019 14:59:50 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Guix,

I avoided doing this when fixing up GDM because it seemed a little
ham-fisted (clumsy).  However, I think it is better than all the ink
that would be spilled on help-guix without it.

In short, the point is to make sure that D-Bus services included in a
user’s profile can be found and started by the session bus.  This means
that if you are using GDM and install “evolution-data-server” and
“gnome-calendar” (for example), the session bus will be able to start
all of the services that GNOME Calendar needs to function correctly.
There are a handful of major GNOME applications that need this.

Furthermore, I think we should add “evolution-data-server” as a
propagated input for packages that require it.  This way, things like
“guix install evolution” will just work the way one expects.

Is it okay to assume that “.guix-profile” is the user’s profile like
this?  If it isn’t okay in general, is it okay enough for now?

>From e32c27dfa950d250520c3c8ecccba90add863639 Mon Sep 17 00:00:00 2001
From: Timothy Sample <[email-masked]>
Date: Wed, 8 May 2019 09:13:14 -0400
Subject: [PATCH] services: gdm: Include user profile in D-Bus paths.

This partially addresses <https://bugs.gnu.org/35267>.

* gnu/services/xorg.scm (dbus-daemon-wrapper): When '$HOME' is set,
include directories from '$HOME/.guix-profile' in the search paths of
the D-Bus daemon.
---
 gnu/services/xorg.scm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 65e9d48915..027524f11d 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -767,14 +767,24 @@ the GNOME desktop environment.")
          (shell (file-append shadow "/sbin/nologin")))))
 
 (define dbus-daemon-wrapper
-  (program-file "gdm-dbus-wrapper"
-                #~(begin
-                    (setenv "XDG_CONFIG_DIRS"
-                            "/run/current-system/profile/etc/xdg")
-                    (setenv "XDG_DATA_DIRS"
-                            "/run/current-system/profile/share")
-                    (apply execl (string-append #$dbus "/bin/dbus-daemon")
-                           (program-arguments)))))
+  (program-file
+   "gdm-dbus-wrapper"
+   #~(begin
+       (use-modules (srfi srfi-26))
+       (let* ((system-profile "/run/current-system/profile")
+              (user-profile (and=> (getenv "HOME")
+                                   (cut string-append <> "/.guix-profile")))
+              (profiles (if user-profile
+                            (list user-profile system-profile)
+                            (list system-profile))))
+         (setenv "XDG_CONFIG_DIRS"
+                 (string-join (map (cut string-append <> "/etc/xdg") profiles)
+                              ":"))
+         (setenv "XDG_DATA_DIRS"
+                 (string-join (map (cut string-append <> "/share") profiles)
+                              ":"))
+         (apply execl (string-append #$dbus "/bin/dbus-daemon")
+                (program-arguments))))))
 
 (define-record-type* <gdm-configuration>
   gdm-configuration make-gdm-configuration
-- 
2.21.0