various: fix replaceVars with placeholder (#376728)

This commit is contained in:
Wolfgang Walther
2025-01-25 19:01:10 +01:00
committed by GitHub
3 changed files with 22 additions and 16 deletions
+8 -6
View File
@@ -26,12 +26,14 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
patches = [
# Include chawan's man pages in mancha's search path
(replaceVars ./mancha-augment-path.diff {
out = placeholder "out";
})
];
patches = [ ./mancha-augment-path.diff ];
# Include chawan's man pages in mancha's search path
postPatch = ''
# As we need the $out reference, we can't use `replaceVars` here.
substituteInPlace adapter/protocol/man.nim \
--replace-fail '@out@' "$out"
'';
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isClang "-Wno-error=implicit-function-declaration"
+7 -5
View File
@@ -68,11 +68,13 @@ in
buildGoModule {
inherit pname version src;
patches = [
(replaceVars ./bridge.patch {
basepath = placeholder "out";
})
];
patches = [ ./bridge.patch ];
postPatch = ''
# As we need the $out reference, we can't use `replaceVars` here.
substituteInPlace bridge/bridge.go \
--replace-fail '@basepath@' "$out"
'';
vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";
+7 -5
View File
@@ -68,11 +68,13 @@ in
buildGoModule {
inherit pname version src;
patches = [
(replaceVars ./bridge.patch {
basepath = placeholder "out";
})
];
patches = [ ./bridge.patch ];
postPatch = ''
# As we need the $out reference, we can't use `replaceVars` here.
substituteInPlace bridge/bridge.go \
--replace-fail '@basepath@' "$out"
'';
vendorHash = "sha256-OrysyJF+lUMf+0vWmOZHjxUdE6fQCKArmpV4alXxtYs=";