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

Merge pull request #67727 from deepfire/serge/electrum

Browse Source 
electrum:  update for the Qt5 change (#65399)
This commit is contained in:
worldofpeace 2019-09-01 05:31:47 -04:00 committed by GitHub
commit e08cb1ff65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
@ -54,6 +54,8 @@ python3Packages.buildPythonApplication rec {
cp -ar ${tests} $sourceRoot/electrum/tests
'';
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
aiorpcx
aiohttp
@ -102,6 +104,11 @@ python3Packages.buildPythonApplication rec {
"Exec=$out/bin/electrum %u" \
--replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \
"Exec=$out/bin/electrum --testnet %u"
'';
postFixup = stdenv.lib.optionalString enableQt ''
wrapQtApp $out/bin/electrum
'';
checkInputs = with python3Packages; [ pytest ];

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

@ -17912,7 +17912,7 @@ in
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 { };