diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-13 13:24:35 +0200 |
| commit | d9bbfe042e06df35c12e4b8f53bfb1889cba90bf (patch) | |
| tree | 9f34077cd824e8955be4ed2b5f1a459aa8076489 /guix/derivations.scm | |
| parent | f87a7cc60e058d2e07560d0d602747b567d9dce4 (diff) | |
| parent | 47f2168b6fabb105565526b2a1243eeeb13008fe (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/derivations.scm')
| -rw-r--r-- | guix/derivations.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm index 7a5c3bca94..cad77bdb06 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -982,12 +982,17 @@ recursively." (define* (build-derivations store derivations #:optional (mode (build-mode normal))) - "Build DERIVATIONS, a list of <derivation> objects or .drv file names, using -the specified MODE." + "Build DERIVATIONS, a list of <derivation> objects, .drv file names, or +derivation/output pairs, using the specified MODE." (build-things store (map (match-lambda + ((? derivation? drv) + (derivation-file-name drv)) ((? string? file) file) - ((and drv ($ <derivation>)) - (derivation-file-name drv))) + (((? derivation? drv) . output) + (cons (derivation-file-name drv) + output)) + (((? string? file) . output) + (cons file output))) derivations) mode)) |