From 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 2 Jun 2017 10:49:32 -0500 Subject: qt5: move kdeDerivation to qt5.mkDerivation --- pkgs/tools/misc/partition-manager/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 dcea9c47aec7..ffee286f57f9 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,11 +1,11 @@ -{ kdeDerivation, kdeWrapper, fetchurl, lib -, ecm, kdoctools +{ mkDerivation, kdeWrapper, fetchurl, lib +, extra-cmake-modules, kdoctools , kconfig, kinit, kpmcore , eject, libatasmart }: let pname = "partitionmanager"; - unwrapped = kdeDerivation rec { + unwrapped = mkDerivation rec { name = "${pname}-${version}"; version = "3.0.1"; @@ -19,11 +19,10 @@ let license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; # refer to kpmcore for the use of eject buildInputs = [ eject libatasmart ]; propagatedBuildInputs = [ kconfig kinit kpmcore ]; - enableParallelBuilding = true; }; in kdeWrapper { -- cgit 1.4.1