summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/grafts.scm6
-rw-r--r--guix/packages.scm4
-rw-r--r--tests/grafts.scm2
-rw-r--r--tests/packages.scm2
4 files changed, 8 insertions, 6 deletions
diff --git a/guix/grafts.scm b/guix/grafts.scm
index 6b78a784e7f..5074809c436 100644
--- a/guix/grafts.scm
+++ b/guix/grafts.scm
@@ -44,8 +44,10 @@
44 (replacement-output graft-replacement-output ;string | #f 44 (replacement-output graft-replacement-output ;string | #f
45 (default "out"))) 45 (default "out")))
46 46
47(define* (graft-derivation store name drv grafts 47(define* (graft-derivation store drv grafts
48 #:key (guile (%guile-for-build)) 48 #:key
49 (name (derivation-name drv))
50 (guile (%guile-for-build))
49 (system (%current-system))) 51 (system (%current-system)))
50 "Return a derivation called NAME, based on DRV but with all the GRAFTS 52 "Return a derivation called NAME, based on DRV but with all the GRAFTS
51applied." 53applied."
diff --git a/guix/packages.scm b/guix/packages.scm
index 93bfbc4683a..f6afaeb5108 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -985,7 +985,7 @@ This is an internal procedure."
985 (grafts 985 (grafts
986 (let ((guile (package-derivation store (default-guile) 986 (let ((guile (package-derivation store (default-guile)
987 system #:graft? #f))) 987 system #:graft? #f)))
988 (graft-derivation store (bag-name bag) drv grafts 988 (graft-derivation store drv grafts
989 #:system system 989 #:system system
990 #:guile guile)))) 990 #:guile guile))))
991 drv)))) 991 drv))))
@@ -1003,7 +1003,7 @@ system identifying string)."
1003 (() 1003 (()
1004 drv) 1004 drv)
1005 (grafts 1005 (grafts
1006 (graft-derivation store (bag-name bag) drv grafts 1006 (graft-derivation store drv grafts
1007 #:system system 1007 #:system system
1008 #:guile 1008 #:guile
1009 (package-derivation store (default-guile) 1009 (package-derivation store (default-guile)
diff --git a/tests/grafts.scm b/tests/grafts.scm
index c11403be19e..4a4122a3e98 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -59,7 +59,7 @@
59 '(call-with-output-file %output 59 '(call-with-output-file %output
60 (lambda (port) 60 (lambda (port)
61 (display "fake mkdir" port))))) 61 (display "fake mkdir" port)))))
62 (graft (graft-derivation %store "graft" orig 62 (graft (graft-derivation %store orig
63 (list (graft 63 (list (graft
64 (origin %bash) 64 (origin %bash)
65 (replacement one)) 65 (replacement one))
diff --git a/tests/packages.scm b/tests/packages.scm
index 68ab3f897b1..6315c2204f3 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -616,7 +616,7 @@
616 (guile (package-derivation %store (canonical-package guile-2.0) 616 (guile (package-derivation %store (canonical-package guile-2.0)
617 #:graft? #f))) 617 #:graft? #f)))
618 (equal? (package-derivation %store dummy) 618 (equal? (package-derivation %store dummy)
619 (graft-derivation %store "dummy-0" 619 (graft-derivation %store
620 (package-derivation %store dummy #:graft? #f) 620 (package-derivation %store dummy #:graft? #f)
621 (package-grafts %store dummy) 621 (package-grafts %store dummy)
622 622