nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

search-paths: 'evaluate-search-paths' can be passed a list of directories. 

* guix/search-paths.scm (evaluate-search-paths): Change 'directory' to
  'directories', and adjust 'search-path-as-list' accordingly.
* guix/scripts/package.scm (search-path-environment-variables): Adjust
  call accordingly.
This commit is contained in:
Ludovic Courtès 2015-05-05 13:55:03 +02:00
parent c4e8d513f2
commit 369149995c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/scripts/package.scm
View File

@ -389,7 +389,8 @@ current settings and report only settings not already effective."
;; TODO: Offer the choice between exact/prefix/suffix.
(environment-variable-definition variable value
#:separator sep))))
(evaluate-search-paths search-paths profile getenv))))
(evaluate-search-paths search-paths (list profile)
getenv))))
(define (display-search-paths entries profile)
"Display the search path environment variables that may need to be set for

11
guix/search-paths.scm
View File

@ -114,11 +114,12 @@ like `string-tokenize', but SEPARATOR is a string."
(else
(reverse (cons string result))))))
(define* (evaluate-search-paths search-paths directory
(define* (evaluate-search-paths search-paths directories
#:optional (getenv (const #f)))
"Evaluate SEARCH-PATHS, a list of search-path specifications, for DIRECTORY,
and return a list of specification/value pairs. Use GETENV to determine the
current settings and report only settings not already effective."
"Evaluate SEARCH-PATHS, a list of search-path specifications, for
DIRECTORIES, a list of directory names, and return a list of
specification/value pairs. Use GETENV to determine the current settings and
report only settings not already effective."
(define search-path-definition
(match-lambda
((and spec
@ -137,7 +138,7 @@ current settings and report only settings not already effective."
;; directories (see
;; <http://lists.gnu.org/archive/html/guix-devel/2015-01/msg00269.html>.)
(path (with-null-error-port
(search-path-as-list files (list directory)
(search-path-as-list files directories
#:type type
#:pattern pattern))))
(if (every (cut member <> values) path)