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.
This commit is contained in:
parent
92753a8bad
commit
af37e6bbd4
|
@ -5098,7 +5098,13 @@ libxml2.")
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags
|
'(#: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
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-before
|
(add-before
|
||||||
|
@ -5119,6 +5125,18 @@ libxml2.")
|
||||||
;; Avoid checking SYSTEMD using pkg-config.
|
;; Avoid checking SYSTEMD using pkg-config.
|
||||||
(setenv "SYSTEMD_CFLAGS" " ")
|
(setenv "SYSTEMD_CFLAGS" " ")
|
||||||
(setenv "SYSTEMD_LIBS" "-lelogind")
|
(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)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("dconf" ,dconf)
|
`(("dconf" ,dconf)
|
||||||
|
|
Loading…
Reference in New Issue