derivations: Add #:guile parameter to 'graft-derivation'.

* guix/derivations.scm (graft-derivation): Add #:guile parameter; pass
  it to 'build-expression->derivation'.
master
Ludovic Courtès 2014-10-12 22:32:38 +02:00
parent 572bcdf0bc
commit 78a90c7f47
1 changed files with 3 additions and 1 deletions

View File

@ -953,7 +953,8 @@ they can refer to each other."
#:guile-for-build guile #:guile-for-build guile
#:local-build? #t))) #: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 "Return a derivation called NAME, based on DRV but with all the first
elements of REPLACEMENTS replaced by the corresponding second element. elements of REPLACEMENTS replaced by the corresponding second element.
REPLACEMENTS must be a list of ((DRV OUTPUT) . (DRV2 OUTPUT)) pairs." 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 (match replacements
(((sources . targets) ...) (((sources . targets) ...)
(build-expression->derivation store name build (build-expression->derivation store name build
#:guile-for-build guile
#:modules '((guix build graft) #:modules '((guix build graft)
(guix build utils)) (guix build utils))
#:inputs `(("original" ,drv) #:inputs `(("original" ,drv)