diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 14:38:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-05 14:38:10 -0500 |
commit | 56d5963382da1b4848615aa9139e527978c64670 (patch) | |
tree | 6e76232d7b4fd5cf3034eef18f0e109f2b86bbb0 /pkgs/applications/misc/electron-cash | |
parent | 066491c2e18d6277e0765a3647068c93650fcd19 (diff) | |
parent | 3adc9d04870605ca20969a98fe820535fc7a88a5 (diff) |
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
Wrap Qt applications
Diffstat (limited to 'pkgs/applications/misc/electron-cash')
-rw-r--r-- | pkgs/applications/misc/electron-cash/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index cc7b9cf27c2a2..9607f428ab9ee 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python3Packages, qtbase, makeWrapper }: +{ lib, fetchurl, python3Packages, qtbase, wrapQtAppsHook }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { btchip ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapQtAppsHook ]; postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ @@ -54,10 +54,6 @@ python3Packages.buildPythonApplication rec { postInstall = '' substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" - - # Please remove this when #44047 is fixed - wrapProgram $out/bin/electron-cash \ - --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins ''; doInstallCheck = true; |