~ruther/guix-local: services: xorg: Properly handle the case where ~/.xession is used.

617e87bff13c38d01d9d16ac9f96b0078e2813fe — Ludovic Courtès 8 years ago 78bae62

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.

patch browse .tar.gz

1 files changed, 2 insertions(+), 1 deletions(-)

M gnu/services/xorg.scm

M gnu/services/xorg.scm => gnu/services/xorg.scm +2 -1

@@ 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