[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: utils: Export 'search-path-as-list'.
From: |
Ludovic Courtès |
Subject: |
05/07: utils: Export 'search-path-as-list'. |
Date: |
Sat, 27 Dec 2014 22:54:54 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit bd2fc4d81342dc15feba2998835e69dabee08864
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 27 23:24:35 2014 +0100
utils: Export 'search-path-as-list'.
* guix/build/utils.scm (search-path-as-list): Make public.
* guix/scripts/environment.scm (for-each-search-path): Use it.
---
guix/build/utils.scm | 1 +
guix/scripts/environment.scm | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 47bcb3e..86b7ca0 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -45,6 +45,7 @@
delete-file-recursively
find-files
+ search-path-as-list
set-path-environment-variable
search-path-as-string->list
list->search-path-as-string
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 412b8be..b3a79d9 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -45,9 +45,8 @@ path value is appended."
(($ <search-path-specification>
variable directories separator)
(let* ((current (getenv variable))
- (path ((@@ (guix build utils) search-path-as-list)
- directories paths))
- (value (list->search-path-as-string path separator)))
+ (path (search-path-as-list directories paths))
+ (value (list->search-path-as-string path separator)))
(proc variable
(if (and current (not pure?))
(string-append value separator current)
- branch core-updates updated (9a224ac -> 2a8d440), Ludovic Courtès, 2014/12/27
- 04/07: packages: Add 'file-pattern' field to 'search-path-specification'., Ludovic Courtès, 2014/12/27
- 01/07: build-system/gnu: Strip with '--strip-all' instead of '--strip-debug'., Ludovic Courtès, 2014/12/27
- 06/07: guix package: Use 'search-path-as-list' instead of custom code., Ludovic Courtès, 2014/12/27
- 05/07: utils: Export 'search-path-as-list'.,
Ludovic Courtès <=
- 07/07: gnu: libxml2: Add search path specification., Ludovic Courtès, 2014/12/27
- 02/07: packages: Add 'file-type' field to 'search-path-specification'., Ludovic Courtès, 2014/12/27
- 03/07: build-support/gnu: Add support for file patterns in search paths., Ludovic Courtès, 2014/12/27