diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-18 12:02:15 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 16:48:32 -0600 |
commit | c9de5eca0f67ef5b56f2cce6f992ebbaf453404d (patch) | |
tree | 88db4c61ff2cef268a9a52d4b36d4c6db94a04a6 /pkgs/tools/text/kdiff3 | |
parent | 0757d49800154b1936cb4c89c578b2ca3c380e71 (diff) |
Remove kde4.kdiff3
- Already updated to KDE 5 in Nixpkgs
Diffstat (limited to 'pkgs/tools/text/kdiff3')
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 47 | ||||
-rw-r--r-- | pkgs/tools/text/kdiff3/kde5.nix | 37 |
2 files changed, 31 insertions, 53 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 664fb87b5205b..f1ae958ed6378 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,22 +1,37 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, gettext +{ + kdeDerivation, kdeWrapper, lib, fetchgit, + ecm, kdoctools, kconfig, kinit, kparts }: -stdenv.mkDerivation rec { - name = "kdiff3-0.9.98"; - src = fetchurl { - url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "0s6n1whkf5ck2r8782a9l8b736cj2p05and1vjjh7d02pax1lb40"; - }; +let + rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; + + unwrapped = kdeDerivation rec { + name = "kdiff3-${version}"; + version = "1.7.0-${lib.strings.substring 0 7 rev}"; + + src = fetchgit { + url = "https://gitlab.com/tfischer/kdiff3"; + sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; + inherit rev; + }; - buildInputs = [ kdelibs ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + preConfigure = "cd kdiff3"; - meta = { - homepage = http://kdiff3.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; - maintainers = with stdenv.lib.maintainers; [viric urkud]; - platforms = with stdenv.lib.platforms; linux; + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ kconfig kinit kparts ]; + + meta = with lib; { + homepage = http://kdiff3.sourceforge.net/; + license = licenses.gpl2Plus; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with maintainers; [ viric urkud peterhoeg ]; + platforms = with platforms; linux; + }; }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/kdiff3" ]; } diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix deleted file mode 100644 index f1ae958ed6378..0000000000000 --- a/pkgs/tools/text/kdiff3/kde5.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - kdeDerivation, kdeWrapper, lib, fetchgit, - ecm, kdoctools, kconfig, kinit, kparts -}: - -let - rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; - - unwrapped = kdeDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-${lib.strings.substring 0 7 rev}"; - - src = fetchgit { - url = "https://gitlab.com/tfischer/kdiff3"; - sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; - inherit rev; - }; - - preConfigure = "cd kdiff3"; - - nativeBuildInputs = [ ecm kdoctools ]; - - propagatedBuildInputs = [ kconfig kinit kparts ]; - - meta = with lib; { - homepage = http://kdiff3.sourceforge.net/; - license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric urkud peterhoeg ]; - platforms = with platforms; linux; - }; - }; - -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/kdiff3" ]; -} |