electrum: fix build using upstream patch instead of own
This commit is contained in:
parent
94e03467ab
commit
5058694c5b
|
@ -1,16 +0,0 @@
|
|||
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
|
||||
index 46ea57c6193..8f2768fac74 100644
|
||||
--- a/pkgs/applications/misc/electrum/default.nix
|
||||
+++ b/pkgs/applications/misc/electrum/default.nix
|
||||
@@ -111,6 +111,11 @@ python3.pkgs.buildPythonApplication {
|
||||
wrapQtApp $out/bin/electrum
|
||||
'';
|
||||
|
||||
+ postPatch = ''
|
||||
+ substituteInPlace contrib/requirements/requirements.txt \
|
||||
+ --replace "protobuf>=3.12,<4" "protobuf>=3.12"
|
||||
+ '';
|
||||
+
|
||||
checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];
|
||||
|
||||
pytestFlagsArray = [ "electrum/tests" ];
|
|
@ -52,6 +52,9 @@ fetchpatch: [
|
|||
sha256 = "sha256-o3UkY9YoCE9hm1ZQ9a4ItZOksbx57V0iF+qC0077pmo=";
|
||||
})
|
||||
|
||||
# fix electrum build: https://github.com/NixOS/nixpkgs/issues/193997
|
||||
./11-electrum-protobuf-fix.patch
|
||||
# electrum: make compatible with protobuf 4+ (fixes electrum build)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/194112.diff";
|
||||
sha256 = "sha256-Nmvu1U5HBT0YQ5aTE2gf0aaglq/1WpgacCbpqP7F+Qc=";
|
||||
})
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue
Block a user