qt5: move kdeDerivation to qt5.mkDerivation

2017-06-02 10:49:32 -05:00
parent 210f688802
commit 7b6f8dc77f
18 changed files with 93 additions and 73 deletions
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
+  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
  extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:

 let
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
    name = "kdiff3-${version}";
    version = "1.7.0-2017-02-19";

@@ -34,8 +34,6 @@ let

    propagatedBuildInputs = [ kconfig kinit kparts ];

-    enableParallelBuilding = true;
-
    meta = with lib; {
      homepage = http://kdiff3.sourceforge.net/;
      license = licenses.gpl2Plus;