From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hORoN-0003BD-5r for guix-patches@gnu.org; Wed, 08 May 2019 15:01:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hORoL-0005Xl-W5 for guix-patches@gnu.org; Wed, 08 May 2019 15:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48719) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hORoL-0005Xf-Rr for guix-patches@gnu.org; Wed, 08 May 2019 15:01:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hORoL-0001Ne-NB for guix-patches@gnu.org; Wed, 08 May 2019 15:01:01 -0400 Subject: [bug#35641] [PATCH] services: gdm: Include user profile in D-Bus paths. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:58434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hORnI-0002kz-2R for guix-patches@gnu.org; Wed, 08 May 2019 14:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hORnG-000511-MM for guix-patches@gnu.org; Wed, 08 May 2019 14:59:55 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56579) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hORnG-0004zv-DJ for guix-patches@gnu.org; Wed, 08 May 2019 14:59:54 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E9C05238EF for ; Wed, 8 May 2019 14:59:51 -0400 (EDT) Received: from mrblack (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id 67568103CF for ; Wed, 8 May 2019 14:59:51 -0400 (EDT) From: Timothy Sample Date: Wed, 08 May 2019 14:59:50 -0400 Message-ID: <87v9yksrfd.fsf@ngyro.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35641@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=E2=80=99s profile can be found and started by the session bus. This m= eans that if you are using GDM and install =E2=80=9Cevolution-data-server=E2=80= =9D and =E2=80=9Cgnome-calendar=E2=80=9D (for example), the session bus will be abl= e 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 =E2=80=9Cevolution-data-server=E2=80=9D = as a propagated input for packages that require it. This way, things like =E2=80=9Cguix install evolution=E2=80=9D will just work the way one expects. Is it okay to assume that =E2=80=9C.guix-profile=E2=80=9D is the user=E2=80= =99s profile like this? If it isn=E2=80=99t okay in general, is it okay enough for now? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-services-gdm-Include-user-profile-in-D-Bus-paths.patch >From e32c27dfa950d250520c3c8ecccba90add863639 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 8 May 2019 09:13:14 -0400 Subject: [PATCH] services: gdm: Include user profile in D-Bus paths. This partially addresses . * 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 make-gdm-configuration -- 2.21.0 --=-=-=--