diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-06-13 17:21:27 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-06-13 17:21:27 +0200 |
| commit | 2acb2cb6d006a4799ae9f477c22177824fcc8f52 (patch) | |
| tree | 4a79c9dc9cde2af4e7e41280de075e12406777ce /guix/gnu-build-system.scm | |
| parent | c36db98c8eaeded5243ecfa1c66e06f38da10692 (diff) | |
Change `build-expression->derivation' to support sub-derivation inputs.
* guix/derivations.scm (build-expression->derivation): Change to expect
INPUTS to have the form (NAME DRV-PATH SUB-DRV) or (NAME DRV-PATH),
instead of (NAME . DRV-PATH). Update callers accordingly.
* guix/gnu-build-system.scm, tests/builders.scm, tests/derivations.scm:
Update accordingly.
Diffstat (limited to 'guix/gnu-build-system.scm')
| -rw-r--r-- | guix/gnu-build-system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/gnu-build-system.scm b/guix/gnu-build-system.scm index 45e9f444ae..811ae965ac 100644 --- a/guix/gnu-build-system.scm +++ b/guix/gnu-build-system.scm @@ -32,7 +32,7 @@ (define %standard-inputs (map (lambda (name) - (cons name (nixpkgs-derivation name))) + (list name (nixpkgs-derivation name))) '("gnutar" "gzip" "bzip2" "xz" "coreutils" "gnused" "gnugrep" "bash" "gcc" "binutils" "gnumake" "glibc"))) @@ -54,8 +54,9 @@ input derivation INPUTS, using the usual procedure of the GNU Build System." (build-expression->derivation store name system builder - (alist-cons "source" source - (append inputs %standard-inputs)) + `(("source" ,source) + ,@inputs + ,@%standard-inputs) #:outputs outputs #:modules '((guix build gnu-build-system) (guix build utils)))) |