git.iko.soy/typeable/nixpkgs
on master help sign in
electrum: update for #65399
commit3d5144a554b4097031dca7aa83edc8f53dd04f87 authorKosyrev Serge <serge.kosyrev@iohk.io> dateFri 30 Aug 2019, 00:30 (7 years ago) parentbc08b42
2 files changed+9−2
pkgs/applications/misc/electrum/default.nix+8−1 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/misc/electrum/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1
1+{ stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
22, enableQt ? !stdenv.isDarwin
33
44
@@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
5454 cp -ar ${tests} $sourceRoot/electrum/tests
5555 '';
5656
57+ nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
58+
5759 propagatedBuildInputs = with python3Packages; [
5860 aiorpcx
5961 aiohttp
@@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
102104 "Exec=$out/bin/electrum %u" \
103105 --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
104106 "Exec=$out/bin/electrum --testnet %u"
107+
108+ '';
109+
110+ postFixup = stdenv.lib.optionalString enableQt ''
111+ wrapQtApp $out/bin/electrum
105112 '';
106113
107114 checkInputs = with python3Packages; [ pytest ];
pkgs/top-level/all-packages.nix+1−1
@@ -17894,7 +17894,7 @@ in
1789417894
1789517895 electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
1789617896
17897− electrum = callPackage ../applications/misc/electrum { };
17897+ electrum = libsForQt5.callPackage ../applications/misc/electrum { };
1789817898
1789917899 electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
1790017900