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/packages.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/packages.scm')
| -rw-r--r-- | guix/packages.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index a25eab7699..ed9a565dc6 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -180,7 +180,8 @@ representation." corresponds to the arguments expected by `set-path-environment-variable'." (match spec (($ <search-path-specification> variable directories separator) - `(,variable ,directories ,separator)))) + ;; TODO: Allow other values of TYPE. See <http://bugs.gnu.org/18033>. + `(,variable ,directories ,separator directory)))) (define %supported-systems ;; This is the list of system types that are supported. By default, we |