From fdfa753c69acb00e4d79ee82f8772bde3e1a6cd6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 May 2015 13:57:59 +0200 Subject: [PATCH] search-paths: Define the 'PATH' environment variable. * guix/search-paths.scm ($PATH): New variable. * guix/scripts/environment.scm (for-each-search-path): Use it. --- guix/scripts/environment.scm | 4 +--- guix/search-paths.scm | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index b40750083..36d7beb34 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -57,9 +57,7 @@ path value is appended." (if (and current (not pure?)) (string-append value separator current) value))))) - (cons* (search-path-specification - (variable "PATH") - (files '("bin" "sbin"))) + (cons* $PATH (delete-duplicates (append-map package-native-search-paths inputs)))))) diff --git a/guix/search-paths.scm b/guix/search-paths.scm index 9dfad8916..89af1e149 100644 --- a/guix/search-paths.scm +++ b/guix/search-paths.scm @@ -31,6 +31,8 @@ search-path-specification-file-type search-path-specification-file-pattern + $PATH + search-path-specification->sexp sexp->search-path-specification evaluate-search-paths @@ -58,6 +60,13 @@ (file-pattern search-path-specification-file-pattern ;#f | string (default #f))) +(define $PATH + ;; The 'PATH' variable. This variable is a bit special: it is not attached + ;; to any package in particular. + (search-path-specification + (variable "PATH") + (files '("bin" "sbin")))) + (define (search-path-specification->sexp spec) "Return an sexp representing SPEC, a . The sexp corresponds to the arguments expected by `set-path-environment-variable'." -- 2.11.4.GIT