diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-11-20 21:12:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-20 21:14:39 +0100 |
| commit | 1d18d87f34d8476ab8cf26b13b3a3ec12223cdb6 (patch) | |
| tree | 44c2ba96a019528c1a69b2dcb73f13fb6d3ad8b2 /gnu | |
| parent | 1c27641f46ce6a02552fda59281727a38d7fe105 (diff) | |
| download | gnu-guix-1d18d87f34d8476ab8cf26b13b3a3ec12223cdb6.tar gnu-guix-1d18d87f34d8476ab8cf26b13b3a3ec12223cdb6.tar.gz | |
services: xorg: Include ~/.guix-profile/bin to the session's $PATH.
Fixes <http://bugs.gnu.org/19119>.
Reported by David Thompson <dthompson2@worcester.edu>.
* gnu/services/xorg.scm (xinitrc): Augment $PATH to include
~/.guix-profile/bin.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/xorg.scm | 16 |
1 files 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")) |