diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-27 22:55:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-27 23:22:55 +0100 |
| commit | 7ec02d374d1fa8a8f4034a996485872fd2aa7b73 (patch) | |
| tree | a4e02e2b268530da692d3a9e94333eb4d8583e57 /guix/build/gnu-build-system.scm | |
| parent | af07095516b56dcdd38bf1874da27de9c4c841f6 (diff) | |
| download | guix-patches-7ec02d374d1fa8a8f4034a996485872fd2aa7b73.tar guix-patches-7ec02d374d1fa8a8f4034a996485872fd2aa7b73.tar.gz | |
build-support/gnu: Add support for file patterns in search paths.
* guix/build/utils.scm (search-path-as-list): Add #:pattern parameter
and honor it.
(set-path-environment-variable): Likewise, and pass it to
'search-path-as-list'.
* guix/packages.scm (search-path-specification->sexp): Add PATTERN slot.
* guix/build/gnu-build-system.scm (set-paths): Adjust accordingly.
Diffstat (limited to 'guix/build/gnu-build-system.scm')
| -rw-r--r-- | guix/build/gnu-build-system.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index d661736831..11b43c521f 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -73,21 +73,23 @@ input-directories))) (for-each (match-lambda - ((env-var (files ...) separator type) + ((env-var (files ...) separator type pattern) (set-path-environment-variable env-var files input-directories #:separator separator - #:type type))) + #:type type + #:pattern pattern))) search-paths) (when native-search-paths ;; Search paths for native inputs, when cross building. (for-each (match-lambda - ((env-var (files ...) separator type) + ((env-var (files ...) separator type pattern) (set-path-environment-variable env-var files native-input-directories #:separator separator - #:type type))) + #:type type + #:pattern pattern))) native-search-paths)) #t) |