diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-05 13:57:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-05 15:13:58 +0200 |
| commit | fdfa753c69acb00e4d79ee82f8772bde3e1a6cd6 (patch) | |
| tree | 6bcd3aad6ea8fc495c9a7cb802f8e70d99ffbe43 | |
| parent | 369149995cd4cedc59f1576a23c4df432e682402 (diff) | |
| download | gnu-guix-fdfa753c69acb00e4d79ee82f8772bde3e1a6cd6.tar gnu-guix-fdfa753c69acb00e4d79ee82f8772bde3e1a6cd6.tar.gz | |
search-paths: Define the 'PATH' environment variable.
* guix/search-paths.scm ($PATH): New variable.
* guix/scripts/environment.scm (for-each-search-path): Use it.
| -rw-r--r-- | guix/scripts/environment.scm | 4 | ||||
| -rw-r--r-- | 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 b40750083c..36d7beb348 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 9dfad89169..89af1e1492 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 <search-path-specification>. The sexp corresponds to the arguments expected by `set-path-environment-variable'." |