ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: xorg: Properly handle the case where ~/.xession is used.

Browse source 
Fixes a regression introduced in
65c0f43649 in the case where users provide
~/.xsession and SESSION is #f.

* gnu/services/xorg.scm (xinitrc): In the XSESSION-FILE case, check
whether SESSION is #f.
This commit is contained in:
Ludovic Courtès 2017-12-04 09:59:11 +01:00
parent 78bae62a25
commit 617e87bff1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/services/xorg.scm
View file

@ -390,7 +390,8 @@ (define (find-session profile)
x)))) x))))
(if (file-exists? xsession-file) (if (file-exists? xsession-file)
;; Run ~/.xsession when it exists. ;; Run ~/.xsession when it exists.
(apply exec-from-login-shell xsession-file session) (apply exec-from-login-shell xsession-file
(or session '()))
;; Otherwise, start the specified session or a fallback. ;; Otherwise, start the specified session or a fallback.
(apply exec-from-login-shell (apply exec-from-login-shell
(or session (or session