aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-15 23:55:36 +0200
committerLudovic Courtès <ludo@gnu.org>2014-10-17 23:23:20 +0200
commite5997888fa75f13735107166d51a1359381d8a79 (patch)
tree25a57beb44c49d75f08234d885f7531a1334423e
parent8dcec9142667d0b29cf71ca55cf48c0c4f5d4400 (diff)
downloadguix-e5997888fa75f13735107166d51a1359381d8a79.tar
guix-e5997888fa75f13735107166d51a1359381d8a79.tar.gz
derivations: 'graft-derivation' correctly handles multiple-output sources.
* guix/derivations.scm (graft-derivation): Add DRV as input for each one of OUTPUT-NAMES.
-rw-r--r--guix/derivations.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm
index 211ecc6f96..ae9d2f46c7 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -1040,7 +1040,9 @@ applied."
#:guile-for-build guile
#:modules '((guix build graft)
(guix build utils))
- #:inputs `(("original" ,drv)
+ #:inputs `(,@(map (lambda (out)
+ `("x" ,drv ,out))
+ output-names)
,@(append (map add-label sources)
(map add-label targets)))
#:outputs output-names