diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 00:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 00:01:24 +0000 |
commit | ef4ddefb6e17a76dfbc5d214d5000651687c7860 (patch) | |
tree | 1011dbe0a931be18d4130b60576d7b7fc0d96413 /pkgs/applications/misc/electrum/default.nix | |
parent | 1965bbf76acf84e8335146b10792320b1076ee28 (diff) | |
parent | 0efb458bc1d1c5d4f36e55ae3c513d5dec615d46 (diff) | |
download | nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.gz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.bz2 nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.lz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.xz nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.tar.zst nixpkgs-ef4ddefb6e17a76dfbc5d214d5000651687c7860.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc/electrum/default.nix')
-rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 28c965a72b5..f722b2315c0 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -43,6 +43,20 @@ let mv ./all/electrum/tests $out ''; }; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + in python3.pkgs.buildPythonApplication { @@ -66,7 +80,7 @@ python3.pkgs.buildPythonApplication { nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -87,7 +101,10 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor - ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle + ]; preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py |