diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-02 10:49:32 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:42:19 -0500 |
| commit | 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 (patch) | |
| tree | f5d0f6f2afd128cdfc0ba5787182393e5237e7ee /pkgs/tools/text/kdiff3 | |
| parent | 210f6888023c1df8aff2d053a5e41f5e1effdfe7 (diff) | |
| download | nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar.gz nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar.bz2 nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar.lz nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar.xz nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.tar.zst nixpkgs-7b6f8dc77f7ba2cc28bdff390f5922befefa8b48.zip | |
qt5: move kdeDerivation to qt5.mkDerivation
Diffstat (limited to 'pkgs/tools/text/kdiff3')
| -rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 124855525ac..3263fe09f6f 100644 --- 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; |