ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdm: Simplify pre-configure phase.

Browse source 
* gnu/packages/gnome.scm (gdm)[arguments]: Simplify the pre-configure phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Timothy Sample 2019-02-13 14:22:18 -05:00 committed by Ludovic Courtès
parent def6d6b616
commit c9ff92b550
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/gnome.scm
View file

@ -5460,25 +5460,21 @@ (define-public gdm
"\"/run/current-system/profile/share/wayland") "\"/run/current-system/profile/share/wayland")
(("DATADIR \"/gnome") (("DATADIR \"/gnome")
"\"/run/current-system/profile/share/gnome")) "\"/run/current-system/profile/share/gnome"))
(substitute* '("daemon/gdm-session.c") (let ((propagate '("GDM_CUSTOM_CONF"
(("set_up_session_environment \\(self\\);") "GDM_X_SERVER"
(string-append ;; XXX: Remove this once GNOME Shell is
"set_up_session_environment (self);\n" ;; a dependency of GDM.
;; Propagate GDM_X_SERVER environment variable (which is set "XDG_DATA_DIRS")))
;; by the GDM service, as it's a function of what X modules (substitute* "daemon/gdm-session.c"
;; the user decides to have available) down to worker (("set_up_session_environment \\(self\\);")
;; processes. (apply string-append
"gdm_session_set_environment_variable (self, \"GDM_X_SERVER\",\n" "set_up_session_environment (self);\n"
" g_getenv (\"GDM_X_SERVER\"));\n" (map (lambda (name)
;; Propagate the GDM_CUSTOM_CONF environment variable. (string-append
"gdm_session_set_environment_variable (self, \"GDM_CUSTOM_CONF\",\n" "gdm_session_set_environment_variable "
" g_getenv (\"GDM_CUSTOM_CONF\"));\n" "(self, \"" name "\","
;; The session bus (which GDM will initialize from the this "g_getenv (\"" name "\"));\n"))
;; session environment) needs to know where to find the system propagate)))))
;; service files.
"gdm_session_set_environment_variable (self, \"XDG_DATA_DIRS\",\n"
" \"/run/current-system/profile/share\");\n"
)))
;; Look for custom GDM conf in /run/current-system. ;; Look for custom GDM conf in /run/current-system.
(substitute* '("common/gdm-settings-desktop-backend.c") (substitute* '("common/gdm-settings-desktop-backend.c")
(("GDM_CUSTOM_CONF") (("GDM_CUSTOM_CONF")