diff options
author | Ludovic Courtès <ludo@gnu.org> | 2023-01-30 16:57:18 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-02-03 16:26:20 +0100 |
commit | 25947bbc3217306742694304fa9b6499f0126c7a (patch) | |
tree | 192395a0169f4ead0ec280324bf210ba7958d5cc /guix/build-system/copy.scm | |
parent | 7c798cd9e4052027b524e71a75a5820484e4847c (diff) | |
download | guix-25947bbc3217306742694304fa9b6499f0126c7a.tar guix-25947bbc3217306742694304fa9b6499f0126c7a.tar.gz |
build-system: Always pass #:graft? #f to 'gexp->derivation'.
Fixes <https://issues.guix.gnu.org/60947>.
Fixes a bug whereby packages referred via 'ungexp' in package arguments
would be "double-grafted": 'gexp->derivation' would first replace those
references by references to the grafted package, only to repeat the
grafting process on the result.
Build systems such as 'gnu', 'cmake', and 'pyproject' were already doing
this. Only the rest of them is affected.
* guix/build-system/cargo.scm (cargo-build): Pass #:graft? #f to
'gexp->derivation'.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/guile.scm (guile-build): Likewise.
(guile-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/waf.scm (waf-build): Likewise.
Diffstat (limited to 'guix/build-system/copy.scm')
-rw-r--r-- | guix/build-system/copy.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index c98b266561..6efc2b2766 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -132,6 +132,7 @@ #:system system #:target #f #:substitutable? substitutable? + #:graft? #f #:guile-for-build guile))) (define copy-build-system |