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/misc/subsurface | |
parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
download | nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixlib-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/applications/misc/subsurface')
-rw-r--r-- | pkgs/applications/misc/subsurface/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 50bb1df2eef2..7bac1db813f4 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -79,18 +79,13 @@ in stdenv.mkDerivation rec { qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake wrapQtAppsHook pkgconfig ]; cmakeFlags = [ "-DLIBDC_FROM_PKGCONFIG=ON" "-DNO_PRINTING=OFF" ]; - postInstall = '' - wrapProgram $out/bin/subsurface \ - --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}" - ''; - enableParallelBuilding = true; passthru = { inherit version libdc googlemaps; }; |