me
/
guix
Archived
1
0
Fork 0
Code

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

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.
master
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 @@ desktop session from the system or user profile will be used."
x))))
(if (file-exists? xsession-file)
;; 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.
(apply exec-from-login-shell
(or session