diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum/grs.nix similarity index 88% rename from pkgs/applications/misc/electrum-grs/default.nix rename to pkgs/applications/misc/electrum/grs.nix index e07e337477ae..a4166a3fe641 100644 --- a/pkgs/applications/misc/electrum-grs/default.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -63,7 +63,13 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; - preBuild = '' + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum_grs/paymentrequest.proto + substituteInPlace ./electrum_grs/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' @@ -85,6 +91,9 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum-grs ''; + # the tests are currently broken + doCheck = false; + postCheck = '' $out/bin/electrum-grs help >/dev/null ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 271505dac835..bec0ec34351a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28440,7 +28440,7 @@ with pkgs; electrum = libsForQt5.callPackage ../applications/misc/electrum { }; - electrum-grs = libsForQt5.callPackage ../applications/misc/electrum-grs { }; + electrum-grs = libsForQt5.callPackage ../applications/misc/electrum/grs.nix { }; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };