From 1d18d87f34d8476ab8cf26b13b3a3ec12223cdb6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 20 Nov 2014 21:12:04 +0100 Subject: 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")) -- cgit v1.2.3 0de8ecd9e3702bca75c9ce0649ac5d4979'>diff
AgeCommit message (Expand)Author
2022-07-01file-systems: Add 'cleanly-unmounted-ext2?'....Ludovic Courtès
2022-04-08file-systems: Invoke fsck tools with 'system*/tty'....Ludovic Courtès
2022-04-08mapped-devices: Ensure 'cryptsetup open' gets a tty....Ludovic Courtès
2021-11-23system: Add swap flags....Josselin Poiret
2021-09-28file-systems: Prefer low-memory mode of ‘btrfs check’....Tobias Geerinckx-Rice
2021-09-23file-systems: Add support for XFS....Tobias Geerinckx-Rice
2021-09-23file-systems: Add file system to *-SUPERBLOCK-VOLUME-NAME docstrings....Tobias Geerinckx-Rice
2021-09-23gnu: Don't abuse check-btrfs-file-system to scan....Tobias Geerinckx-Rice
2021-09-23file-systems: Support forced checks & repairs....Tobias Geerinckx-Rice
2021-05-04file-systems: Rewrite comment....Tobias Geerinckx-Rice
2021-05-04file-systems: Handle abnormal ‘bcachefs fsck’ exits....Tobias Geerinckx-Rice
2021-04-23file-systems: read-partition-{uuid,label} don't swallow ENOENT & co....Ludovic Courtès