diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-27 12:16:18 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-27 12:25:31 +0100 |
| commit | 6aa47e388390e98bec6caa90fef7f39a60e338a7 (patch) | |
| tree | da30bc1b7f2d8872890092afaaa3b561a8952ccc /guix/build/gnu-build-system.scm | |
| parent | 8c89f514bf8679ce4ebd9d3f4c8e6589340dba9a (diff) | |
| download | gnu-guix-6aa47e388390e98bec6caa90fef7f39a60e338a7.tar gnu-guix-6aa47e388390e98bec6caa90fef7f39a60e338a7.tar.gz | |
build-system/gnu: Add support for non-directory search paths.
Partly fixes <http://bugs.gnu.org/18033>.
* guix/build/utils.scm (search-path-as-list): Rename 'sub-directories'
parameter to 'files'. Add #:type parameter and honor it.
(set-path-environment-variable): Likewise. Pass #:type to
'search-path-as-list'.
* guix/packages.scm (search-path-specification->sexp): Add 'directory as
the last item of the tuple.
* guix/build/gnu-build-system.scm (set-paths): Add 'type' to search-path
pattern. Pass #:type to 'set-path-environment-variable'.
Diffstat (limited to 'guix/build/gnu-build-system.scm')
| -rw-r--r-- | guix/build/gnu-build-system.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index d3de92b724..4cc755f3a6 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -73,19 +73,21 @@ input-directories))) (for-each (match-lambda - ((env-var (directories ...) separator) - (set-path-environment-variable env-var directories + ((env-var (files ...) separator type) + (set-path-environment-variable env-var files input-directories - #:separator separator))) + #:separator separator + #:type type))) search-paths) (when native-search-paths ;; Search paths for native inputs, when cross building. (for-each (match-lambda - ((env-var (directories ...) separator) - (set-path-environment-variable env-var directories + ((env-var (files ...) separator type) + (set-path-environment-variable env-var files native-input-directories - #:separator separator))) + #:separator separator + #:type type))) native-search-paths)) #t) |