From 617e87bff13c38d01d9d16ac9f96b0078e2813fe Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 4 Dec 2017 09:59:11 +0100 Subject: 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 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 -- cgit v1.2.3