me
/
guix
Archived
1
0
Fork 0
Code

gnu: gdm: Use absolute path for gnome-session. 

* gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure
phase to substitute in the absolute path of gnome-session.
[inputs]: Add gnome-session.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Timothy Sample 2019-02-13 14:22:17 -05:00 committed by Ludovic Courtès
parent 69544798ea
commit def6d6b616
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gnome.scm
View File

@ -5431,7 +5431,7 @@ libxml2.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before
'configure 'pre-configure 'configure 'pre-configure
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
;; We don't have <systemd/sd-daemon.h>. ;; We don't have <systemd/sd-daemon.h>.
(substitute* '("common/gdm-log.c" (substitute* '("common/gdm-log.c"
"daemon/gdm-server.c" "daemon/gdm-server.c"
@ -5492,6 +5492,11 @@ libxml2.")
(substitute* '("daemon/gdm-x-session.c") (substitute* '("daemon/gdm-x-session.c")
(("X_SERVER") (("X_SERVER")
"g_getenv (\"GDM_X_SERVER\")")) "g_getenv (\"GDM_X_SERVER\")"))
;; Use an absolute path for GNOME Session.
(substitute* "daemon/gdm-launch-environment.c"
(("\"gnome-session\"")
(string-append "\"" (assoc-ref inputs "gnome-session")
"/bin/gnome-session\"")))
#t)) #t))
;; GDM needs GNOME Session to run these applications. We link ;; GDM needs GNOME Session to run these applications. We link
;; their autostart files in `share/gdm/greeter/autostart' ;; their autostart files in `share/gdm/greeter/autostart'
@ -5523,6 +5528,7 @@ libxml2.")
`(("accountsservice" ,accountsservice) `(("accountsservice" ,accountsservice)
("check" ,check) ; for testing ("check" ,check) ; for testing
("elogind" ,elogind) ("elogind" ,elogind)
("gnome-session" ,gnome-session)
("gnome-settings-daemon" ,gnome-settings-daemon) ("gnome-settings-daemon" ,gnome-settings-daemon)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes)