From 1d18d87f34d8476ab8cf26b13b3a3ec12223cdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 20 Nov 2014 21:12:04 +0100 Subject: [PATCH] services: xorg: Include ~/.guix-profile/bin to the session's $PATH. Fixes . Reported by David Thompson . * gnu/services/xorg.scm (xinitrc): Augment $PATH to include ~/.guix-profile/bin. --- gnu/services/xorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 2d25635bcb..5236573a39 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -142,10 +142,18 @@ EndSection #~(begin (use-modules (ice-9 match)) - ;; First, try to run ~/.xsession. - (let* ((home (getenv "HOME")) - (file (string-append home "/.xsession"))) - (false-if-exception (execl file file))) + (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))) ;; Then try a pre-configured session type. (let ((ratpoison (string-append #$ratpoison "/bin/ratpoison"))