[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: gnu: gdm: Add links to required login-session files.
From: |
guix-commits |
Subject: |
04/10: gnu: gdm: Add links to required login-session files. |
Date: |
Sat, 16 Feb 2019 18:05:24 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 69544798ea9cc3b6d06c4b40e3560fd7a17215b2
Author: Timothy Sample <address@hidden>
Date: Wed Feb 13 14:22:16 2019 -0500
gnu: gdm: Add links to required login-session files.
* gnu/packages/gnome.scm (gdm)[arguments]: Add a phase that creates
symbolic links to required files from gnome-settings-daemon; do not set
XDG_CONFIG_DIRS in the session environment.
[inputs]: Add gnome-settings-daemon.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/gnome.scm | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fb66457..ec6d3fb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5473,16 +5473,6 @@ libxml2.")
;; Propagate the GDM_CUSTOM_CONF environment variable.
"gdm_session_set_environment_variable (self,
\"GDM_CUSTOM_CONF\",\n"
" g_getenv (\"GDM_CUSTOM_CONF\"));\n"
- ;; FIXME: Really glib should be declaring XDG_CONFIG_DIRS as a
- ;; variable, but it doesn't do that right now. Anyway
- ;;
/run/current-system/profile/share/gnome-session/sessions/gnome.desktop
- ;; requires that a number of .desktop files be present, and
- ;; these special .desktop files are in $XDG_CONFIG_DIRS (which
- ;; defaults to /etc/xdg if it's not set). Here we need to
- ;; provide a value such that the GNOME session's requirements
- ;; are met (provided GNOME is installed of course).
- "gdm_session_set_environment_variable (self,
\"XDG_CONFIG_DIRS\",\n"
- " \"/run/current-system/profile/etc/xdg\");\n"
;; The session bus (which GDM will initialize from the this
;; session environment) needs to know where to find the system
;; service files.
@@ -5502,7 +5492,25 @@ libxml2.")
(substitute* '("daemon/gdm-x-session.c")
(("X_SERVER")
"g_getenv (\"GDM_X_SERVER\")"))
- #t)))))
+ #t))
+ ;; GDM needs GNOME Session to run these applications. We link
+ ;; their autostart files in `share/gdm/greeter/autostart'
+ ;; because GDM explicitly tells GNOME Session to look there.
+ ;;
+ ;; XXX: GNOME Shell should be linked here too, but currently
+ ;; GNOME Shell depends on GDM.
+ (add-after 'install 'link-autostart-files
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (autostart (string-append out "/share/gdm/"
+ "greeter/autostart"))
+ (settings (assoc-ref inputs "gnome-settings-daemon")))
+ (mkdir-p autostart)
+ (with-directory-excursion autostart
+ (for-each (lambda (desktop)
+ (symlink desktop (basename desktop)))
+ (find-files (string-append settings "/etc/xdg"))))
+ #t))))))
(native-inputs
`(("dconf" ,dconf)
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
@@ -5515,6 +5523,7 @@ libxml2.")
`(("accountsservice" ,accountsservice)
("check" ,check) ; for testing
("elogind" ,elogind)
+ ("gnome-settings-daemon" ,gnome-settings-daemon)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libcanberra" ,libcanberra)
- branch master updated (8d2c3c5 -> 54eadc4), guix-commits, 2019/02/16
- 01/10: doc: '--inherit' option can be repeated., guix-commits, 2019/02/16
- 03/10: gnu: gnome-session: Use absolute paths in .desktop files., guix-commits, 2019/02/16
- 02/10: services: gdm: Remove etc service., guix-commits, 2019/02/16
- 04/10: gnu: gdm: Add links to required login-session files.,
guix-commits <=
- 07/10: gnu: gdm: Run dbus-daemon via a wrapper script., guix-commits, 2019/02/16
- 08/10: services: gdm: Make dependencies explicit., guix-commits, 2019/02/16
- 09/10: services: gdm: Allow for custom X session scripts., guix-commits, 2019/02/16
- 06/10: gnu: gdm: Simplify pre-configure phase., guix-commits, 2019/02/16
- 05/10: gnu: gdm: Use absolute path for gnome-session., guix-commits, 2019/02/16
- 10/10: self: Generated (guix config) honors %CURRENT-SYSTEM., guix-commits, 2019/02/16