diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-12-04 09:59:11 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-12-04 10:36:48 +0100 |
| commit | 617e87bff13c38d01d9d16ac9f96b0078e2813fe (patch) | |
| tree | ea9b98f6e3e048648ff19d6f6c8f87a28e4576e2 | |
| parent | 78bae62a25d2f29886a27699f5a07afa375192c0 (diff) | |
| download | guix-617e87bff13c38d01d9d16ac9f96b0078e2813fe.tar.gz guix-617e87bff13c38d01d9d16ac9f96b0078e2813fe.tar.xz | |
services: xorg: Properly handle the case where ~/.xession is used.
Fixes a regression introduced in
65c0f43649b455db94f1e8b0a244a889cb961b25 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.
| -rw-r--r-- | gnu/services/xorg.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 8f285b29a3..cef0d60b59 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -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 |