diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
| commit | f21211ebfe21797c6f0444d42ec7cb835c737388 (patch) | |
| tree | 816465981f650242d4b22e0f01b912917e7008f8 /pkgs/applications/misc/electrum | |
| parent | b291f2a9953d48d6edc5c73776db9ba289ccf213 (diff) | |
| parent | 12ae04518b004adf949a43125954b99c05189e6f (diff) | |
| download | nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.gz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.bz2 nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.lz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.xz nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.zst nixpkgs-f21211ebfe21797c6f0444d42ec7cb835c737388.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/misc/electrum')
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 31697432226..c48d458567d 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -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 { cp -ar ${tests} $sourceRoot/electrum/tests ''; + nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ aiorpcx aiohttp @@ -102,6 +104,11 @@ python3Packages.buildPythonApplication { "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 ]; |