diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2024-05-06 17:34:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-06 17:34:36 +0200 |
commit | f298c79b8eef527b5ff51168c850dc9362dfa4a7 (patch) | |
tree | 8cf0e9241e979394216c31a2249837083e42c686 /pkgs/applications/misc | |
parent | 632d84532480004bf91567906a0f8a4a0e70ffc0 (diff) | |
parent | 0e513f0435b2edb2c53412df873b46c583b0f9b5 (diff) |
Merge pull request #309576 from Yarny0/electrum-patch-aiorpcx
electrum: add patch for aiorpcx compatibility
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index eb24885ca1425..8250ebfe289b9 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , wrapQtAppsHook , python3 , zbar @@ -109,7 +110,30 @@ python.pkgs.buildPythonApplication { pyqt6 ]; + patches = [ + # aiorpcx 0.23.1 compatibility + # Note: this patches `/run_electrum`. + # In the source repo, `/electrum/electrum` + # is a symlink to `../run_electrum`, + # so that path would also be affected by the patch. + # However, in the distribution tarball used here, + # `/electrum/electrum` is simply an exact copy of + # `/run_electrum` and is thereby *not* affected. + # So we have to manually copy the patched `/run_electrum` + # over `/electrum/electrum` after the patching (see below). + # XXX remove the copy command in `postPatch` + # as soon as the patch itself is removed! + (fetchpatch { + url = "https://github.com/spesmilo/electrum/commit/5f95d919dfa9868eaf82889903b94faa8c6443e0.patch"; + hash = "sha256-cEkduLsL6A8qPhXS2KPQWzVtkQPYQhHSbuwQ2SnanHw="; + }) + ]; + postPatch = '' + # copy the patched `/run_electrum` over `/electrum/electrum` + # so the aiorpcx compatibility patch is used + cp run_electrum electrum/electrum + # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ --replace "protobuf>=3.20,<4" "protobuf>=3.20" |