public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electrum: update for #65399

This commit is contained in:
Kosyrev Serge 2019-08-30 00:30:30 +03:00
parent bc08b42da4
commit 3d5144a554
No known key found for this signature in database
GPG Key ID: 3F62F118E38BED6D
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/electrum/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 { stdenv, fetchurl, fetchFromGitHub, wrapQtAppsHook, python3, python3Packages, zbar, secp256k1
, enableQt ? !stdenv.isDarwin , enableQt ? !stdenv.isDarwin
@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
cp -ar ${tests} $sourceRoot/electrum/tests cp -ar ${tests} $sourceRoot/electrum/tests
''; '';
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
aiorpcx aiorpcx
aiohttp aiohttp
@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \ "Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u" "Exec=$out/bin/electrum --testnet %u"
'';
postFixup = stdenv.lib.optionalString enableQt ''
wrapQtApp $out/bin/electrum
''; '';
checkInputs = with python3Packages; [ pytest ]; checkInputs = with python3Packages; [ pytest ];

2
pkgs/top-level/all-packages.nix
View File

@ -17894,7 +17894,7 @@ in
electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
electrum = callPackage ../applications/misc/electrum { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { };
electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };