summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-09-23 14:40:15 +0200
committerLudovic Courtès <ludo@gnu.org>2020-09-27 21:41:11 +0200
commitb3fc03ee266a5f6d810d780582d458e561efccf3 (patch)
tree3a20f6e366f8fa57bed944d267ef66b44c50e3d2 /guix
parent2bf6f962b91123b0474c0f7123cd17efe7f09a66 (diff)
packages: 'package-mapping' correctly recurses into 'replacement'.
Previously, something like: guix build glib --with-graft=glibc=glibc@2.29 would produce a result showing that rewriting rules were not applied to libx11@1.6.A (a replacement). * guix/packages.scm (package-mapping): Call REPLACE instead of PROC to 'replacement'. * tests/packages.scm ("package-input-rewriting/spec, graft"): New test.
Diffstat (limited to 'guix')
-rw-r--r--guix/packages.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index f696945e30..0d0d7492b6 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1037,7 +1037,7 @@ applied to implicit inputs as well."
(inputs (map rewrite (package-inputs p)))
(native-inputs (map rewrite (package-native-inputs p)))
(propagated-inputs (map rewrite (package-propagated-inputs p)))
- (replacement (and=> (package-replacement p) proc))
+ (replacement (and=> (package-replacement p) replace))
(properties `((,mapping-property . #t)
,@(package-properties p))))))))