diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/applications/networking/protonmail-bridge | |
parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/networking/protonmail-bridge')
-rw-r--r-- | pkgs/applications/networking/protonmail-bridge/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2870f3158fb64..807b8116b46fc 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full, - libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full +, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }: let version = "1.1.5-1"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapQtAppsHook ]; sourceRoot = "."; @@ -60,18 +60,11 @@ in stdenv.mkDerivation rec { libpulseaudio glib ]; - - qtPath = prefix: "${full}/${prefix}"; in '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/protonmail-bridge - - wrapProgram $out/lib/protonmail-bridge \ - --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \ - --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ - --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ ''; meta = with stdenv.lib; { |