From 2ce4840754850ff57dfb69392fb29f61fec0e743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 15 Mar 2010 14:26:58 +0000 Subject: [PATCH] Adding kdiff3 as extragear. I don't know if 'extragear' involves a specific list of packages. (Thanks to Stephen for a patch) svn path=/nixpkgs/trunk/; revision=20634 --- pkgs/desktops/kde-4.4/default.nix | 6 ++++++ pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index e3eb9ba7af57..775239376d84 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -237,6 +237,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; + kdiff3 = import ./extragear/kdiff3 { + inherit (pkgs) stdenv fetchurl cmake qt4 gettext perl; + inherit kdelibs kdebase; + inherit automoc4 phonon; + }; + kipiplugins = import ./extragear/kipi-plugins { inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; inherit kdelibs kdepimlibs kdegraphics; diff --git a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix new file mode 100644 index 000000000000..d53fdbaf2e69 --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase, automoc4, phonon, gettext}: + +stdenv.mkDerivation { + name = "kdiff3-0.9.95"; + src = fetchurl { + url = http://downloads.sourceforge.net/project/kdiff3/kdiff3/0.9.95/kdiff3-0.9.95.tar.gz; + sha256 = "0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f"; + }; + + cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + + # kdebase allows having a konqueror plugin built + buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ]; +}