diff options
| -rw-r--r-- | gnu/services/xorg.scm | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index c813f0fb1e..fbf96c799b 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -143,28 +143,31 @@ EndSection #~(begin (use-modules (ice-9 match)) + (define (exec-from-login-shell command . args) + ;; Run COMMAND from a login shell so that it gets to see the same + ;; environment variables that one gets when logging in on a tty, for + ;; instance. + (let* ((pw (getpw (getuid))) + (shell (passwd:shell pw)) + (st (stat command #f))) + (when (and st (not (zero? (logand (stat:mode st) #o100)))) + ;; The '--login' option is supported at least by Bash and zsh. + (execl shell shell "--login" "-c" + (string-join (cons command args)))))) + + ;; First, try to run ~/.xsession. (let* ((home (getenv "HOME")) - (profile (string-append home "/.guix-profile/bin")) - (PATH (or (getenv "PATH") "")) (xsession (string-append home "/.xsession"))) - ;; Make sure the user's profile is visible. - (setenv "PATH" - (string-append profile - (if (string-null? PATH) "" ":") - PATH)) - - ;; First, try to run ~/.xsession. - (false-if-exception (execl xsession xsession))) + (exec-from-login-shell xsession)) ;; Then try a pre-configured session type. (let ((ratpoison (string-append #$ratpoison "/bin/ratpoison")) (wmaker (string-append #$windowmaker "/bin/wmaker"))) (match (command-line) ((_ "ratpoison") - (execl ratpoison ratpoison)) + (exec-from-login-shell ratpoison)) (_ - ;; 'wmaker' does execvp(argv[0]), so we really can't mess up. - (execl wmaker wmaker)))))) + (exec-from-login-shell wmaker)))))) (gexp->script "xinitrc" builder)) |