summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-12 22:32:38 +0200
committerLudovic Courtès <ludo@gnu.org>2014-10-12 22:32:38 +0200
commit78a90c7f4714035682fc8bbc9382ef42ac848140 (patch)
treec19fc0571d2ff48cb2911dfc666c410d67d0ff53
parent572bcdf0bcd483b168110cb7d25dd6ad28ab9172 (diff)
downloadpatches-78a90c7f4714035682fc8bbc9382ef42ac848140.tar
patches-78a90c7f4714035682fc8bbc9382ef42ac848140.tar.gz
derivations: Add #:guile parameter to 'graft-derivation'.
* guix/derivations.scm (graft-derivation): Add #:guile parameter; pass it to 'build-expression->derivation'.
-rw-r--r--guix/derivations.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/derivations.scm b/guix/derivations.scm
index a9b2c5c79d..7e974bf541 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -953,7 +953,8 @@ they can refer to each other."
#:guile-for-build guile
#:local-build? #t)))
-(define (graft-derivation store name drv replacements)
+(define* (graft-derivation store name drv replacements
+ #:key (guile (%guile-for-build)))
"Return a derivation called NAME, based on DRV but with all the first
elements of REPLACEMENTS replaced by the corresponding second element.
REPLACEMENTS must be a list of ((DRV OUTPUT) . (DRV2 OUTPUT)) pairs."
@@ -1003,6 +1004,7 @@ REPLACEMENTS must be a list of ((DRV OUTPUT) . (DRV2 OUTPUT)) pairs."
(match replacements
(((sources . targets) ...)
(build-expression->derivation store name build
+ #:guile-for-build guile
#:modules '((guix build graft)
(guix build utils))
#:inputs `(("original" ,drv)