[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: gdm: Look for sessions in /run/current-system.
From: |
Andy Wingo |
Subject: |
04/08: gnu: gdm: Look for sessions in /run/current-system. |
Date: |
Fri, 25 Aug 2017 10:02:48 -0400 (EDT) |
wingo pushed a commit to branch master
in repository guix.
commit af37e6bbd4a0b97c8147ccbd1548dc2e5f830466
Author: Andy Wingo <address@hidden>
Date: Tue Aug 22 14:06:40 2017 +0200
gnu: gdm: Look for sessions in /run/current-system.
* gnu/packages/gnome.scm (gdm): Fix search paths for system sessions. Use
/var as localstatedir. Set a more sensible default path for user
sessions.
---
gnu/packages/gnome.scm | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab8e087..a26688d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5098,7 +5098,13 @@ libxml2.")
(build-system gnu-build-system)
(arguments
'(#:configure-flags
- '("--without-plymouth")
+ `("--without-plymouth"
+ "--localstatedir=/var"
+ ,(string-append "--with-default-path="
+ (string-join '("/run/setuid-programs"
+ "/run/current-system/profile/bin"
+ "/run/current-system/profile/sbin")
+ ":")))
#:phases
(modify-phases %standard-phases
(add-before
@@ -5119,6 +5125,18 @@ libxml2.")
;; Avoid checking SYSTEMD using pkg-config.
(setenv "SYSTEMD_CFLAGS" " ")
(setenv "SYSTEMD_LIBS" "-lelogind")
+ ;; Look for system-installed sessions in
+ ;; /run/current-system/profile/share.
+ (substitute* '("libgdm/gdm-sessions.c"
+ "daemon/gdm-session.c"
+ "daemon/gdm-display.c"
+ "daemon/gdm-launch-environment.c")
+ (("DATADIR \"/x")
+ "\"/run/current-system/profile/share/x")
+ (("DATADIR \"/wayland")
+ "\"/run/current-system/profile/share/wayland")
+ (("DATADIR \"/gnome")
+ "\"/run/current-system/profile/share/gnome"))
#t)))))
(native-inputs
`(("dconf" ,dconf)
- branch master updated (cb8b14f -> 6e99c01), Andy Wingo, 2017/08/25
- 02/08: gnu: Add AccountsService service to desktop services., Andy Wingo, 2017/08/25
- 05/08: gnu: gdm: Use proper elogind check, and wrap environment., Andy Wingo, 2017/08/25
- 07/08: gnu: services: Log debug messages to /var/log/debug., Andy Wingo, 2017/08/25
- 01/08: gnu: accountsservice: Properly reference shadow., Andy Wingo, 2017/08/25
- 03/08: gnu: services: Refactor to separate X and startx wrappers., Andy Wingo, 2017/08/25
- 04/08: gnu: gdm: Look for sessions in /run/current-system.,
Andy Wingo <=
- 08/08: gnu: Add draft of gdm service., Andy Wingo, 2017/08/25
- 06/08: gnu: gdm: Fix environment of worker processes and sessions., Andy Wingo, 2017/08/25