From 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 5 Jul 2019 10:42:08 -0500 Subject: wrapQtAppsHook: Remove ad hoc Qt wrappers --- pkgs/tools/misc/partition-manager/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'pkgs/tools/misc/partition-manager') diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 4599309b238..1c094c291d8 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib -, extra-cmake-modules, kdoctools, wrapGAppsHook +, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook , kconfig, kcrash, kinit, kpmcore -, eject, libatasmart , utillinux, makeWrapper, qtbase +, eject, libatasmart , utillinux, qtbase }: let @@ -17,16 +17,12 @@ in mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook ]; # refer to kpmcore for the use of eject buildInputs = [ eject libatasmart utillinux ]; propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; - postInstall = '' - wrapProgram "$out/bin/partitionmanager" --prefix QT_PLUGIN_PATH : "${kpmcore}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins" - ''; - meta = with lib; { description = "KDE Partition Manager"; license = licenses.gpl2; -- cgit 1.4.1