summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-04 22:27:11 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-04 23:30:52 +0200
commit441cfb420ab7979443cc2752b714738151c9c4e6 (patch)
tree3e6ff3b7721ace02c055d1073473e77e856ba555 /guix/scripts
parentb07901c0cc5b36efdc92263ddeaa2be28cf2f398 (diff)
search-paths: 'evaluate-search-paths' now returns spec/value pairs.
* guix/search-paths.scm (evaluate-search-paths): Return specification/value pairs instead of variable/value pairs. * guix/scripts/package.scm (search-path-environment-variables): Adjust accordingly. Pass #:separator to 'environment-variable-definition'.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/package.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 9e433dd191..7f53af772f 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -383,8 +383,12 @@ current settings and report only settings not already effective."
(let ((search-paths (delete-duplicates
(append-map manifest-entry-search-paths entries))))
(filter-map (match-lambda
- ((variable . value)
- (environment-variable-definition variable value)))
+ ((spec . value)
+ (let ((variable (search-path-specification-variable spec))
+ (sep (search-path-specification-separator spec)))
+ ;; TODO: Offer the choice between exact/prefix/suffix.
+ (environment-variable-definition variable value
+ #:separator sep))))
(evaluate-search-paths search-paths profile getenv))))
(define (display-search-paths entries profile)