[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/10: gnu: gdm: Simplify pre-configure phase.
From: |
guix-commits |
Subject: |
06/10: gnu: gdm: Simplify pre-configure phase. |
Date: |
Sat, 16 Feb 2019 18:05:24 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit c9ff92b550f4cb27f07ff093d59fc201ffea7e80
Author: Timothy Sample <address@hidden>
Date: Wed Feb 13 14:22:18 2019 -0500
gnu: gdm: Simplify pre-configure phase.
* gnu/packages/gnome.scm (gdm)[arguments]: Simplify the pre-configure phase.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/gnome.scm | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3862033..dec567a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5460,25 +5460,21 @@ libxml2.")
"\"/run/current-system/profile/share/wayland")
(("DATADIR \"/gnome")
"\"/run/current-system/profile/share/gnome"))
- (substitute* '("daemon/gdm-session.c")
- (("set_up_session_environment \\(self\\);")
- (string-append
- "set_up_session_environment (self);\n"
- ;; Propagate GDM_X_SERVER environment variable (which is set
- ;; by the GDM service, as it's a function of what X modules
- ;; the user decides to have available) down to worker
- ;; processes.
- "gdm_session_set_environment_variable (self,
\"GDM_X_SERVER\",\n"
- " g_getenv (\"GDM_X_SERVER\"));\n"
- ;; Propagate the GDM_CUSTOM_CONF environment variable.
- "gdm_session_set_environment_variable (self,
\"GDM_CUSTOM_CONF\",\n"
- " g_getenv (\"GDM_CUSTOM_CONF\"));\n"
- ;; The session bus (which GDM will initialize from the this
- ;; session environment) needs to know where to find the system
- ;; service files.
- "gdm_session_set_environment_variable (self,
\"XDG_DATA_DIRS\",\n"
- " \"/run/current-system/profile/share\");\n"
- )))
+ (let ((propagate '("GDM_CUSTOM_CONF"
+ "GDM_X_SERVER"
+ ;; XXX: Remove this once GNOME Shell is
+ ;; a dependency of GDM.
+ "XDG_DATA_DIRS")))
+ (substitute* "daemon/gdm-session.c"
+ (("set_up_session_environment \\(self\\);")
+ (apply string-append
+ "set_up_session_environment (self);\n"
+ (map (lambda (name)
+ (string-append
+ "gdm_session_set_environment_variable "
+ "(self, \"" name "\","
+ "g_getenv (\"" name "\"));\n"))
+ propagate)))))
;; Look for custom GDM conf in /run/current-system.
(substitute* '("common/gdm-settings-desktop-backend.c")
(("GDM_CUSTOM_CONF")
- 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, 2019/02/16
- 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 <=
- 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