diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:29:34 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-17 13:29:34 +0000 |
commit | 8b4f5714917e55c749a7a193aa31874fa2dc680e (patch) | |
tree | 3ae801f43fe52889d6ee22c2730ea5bf8f8ac269 /pkgs/tools/text/kdiff3/default.nix | |
parent | afb26b6aed110266571a7a0c0f14d10e78da0571 (diff) |
kdiff3-0.9.96
svn path=/nixpkgs/trunk/; revision=32348
Diffstat (limited to 'pkgs/tools/text/kdiff3/default.nix')
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index a474a036661b..d8807bda08bc 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext, kde_baseapps }: +{ stdenv, fetchurl, cmake, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "kdiff3-0.9.95"; + name = "kdiff3-0.9.96"; src = fetchurl { url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "03rg41vdi44wh7kygv46nkzyrirl6qyar901hnlmdwjpi6ycwwh3"; + sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh"; }; - # kdebase allows having a konqueror plugin built - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kde_baseapps ]; - - # Adjust the version of the DocBook XML to 4.2 ( so that it validates ). - patches = [ ./adjust-docbook-xml-version-to-4.2.patch ]; + buildInputs = [ kdelibs ]; + buildNativeInputs = [ cmake gettext ]; meta = { homepage = http://kdiff3.sourceforge.net/; license = "GPLv2+"; description = "Compares and merges 2 or 3 files or directories"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; }; } |