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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 617e87bff13c38d01d9d16ac9f96b0078e2813fe
Author: Ludovic Courtès <address@hidden>
Date:   Mon Dec 4 09:59:11 2017 +0100

    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.
---
 gnu/services/xorg.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 8f285b2..cef0d60 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