Skip to content

Commit

Permalink
Merge #703: treewide: use substituteInPlace --replace-fail
Browse files Browse the repository at this point in the history
44addcb treewide: use `substituteInPlace --replace-fail` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 44addcb

Tree-SHA512: ef5677ed38f253c3db88f149d2bf996773d81fedb1592a878060ee5384fe332efda907e710737053201e60d7151161379b9b974f57b6d51237f648e95b061381
  • Loading branch information
jonasnick committed May 24, 2024
2 parents aab479f + 44addcb commit 84b8b1f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkgs/python-packages/python-bitcointx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildPythonPackageWithDepsCheck rec {
patchPhase = ''
for path in core/secp256k1.py tests/test_load_secp256k1.py; do
substituteInPlace "bitcointx/$path" \
--replace "ctypes.util.find_library('secp256k1')" "'${secp256k1}/lib/libsecp256k1.so'"
--replace-fail "ctypes.util.find_library('secp256k1')" "'${secp256k1}/lib/libsecp256k1.so'"
done
'';

Expand Down
2 changes: 1 addition & 1 deletion test/tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ let
clightning = super.clightning.overrideAttrs (old: {
postPatch = old.postPatch + ''
substituteInPlace lightningd/plugin.c \
--replace "#define PLUGIN_MANIFEST_TIMEOUT 60" "#define PLUGIN_MANIFEST_TIMEOUT 200"
--replace-fail "#define PLUGIN_MANIFEST_TIMEOUT 60" "#define PLUGIN_MANIFEST_TIMEOUT 200"
'';
});
};
Expand Down

0 comments on commit 84b8b1f

Please sign in to comment.