* More stuff.

svn path=/nixpkgs/branches/kde-4.7/; revision=28006

6 files changed, 74 insertions, 3 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index e07a5d245907e..d3a64462488b5 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -40,7 +40,9 @@ recurseIntoAttrs rec {
 
   libkipi = callPackage ./libkipi.nix { };
 
-  #kipi_plugins = callPackage ./kipi-plugins { };
+  libkdcraw = callPackage ./libkdcraw.nix { };
+
+  kipi_plugins = callPackage ./kipi-plugins.nix { };
 
 ### LIBS
 
@@ -87,6 +89,10 @@ recurseIntoAttrs rec {
   
   kdemultimedia = callPackage ./multimedia.nix { };
 
+  kolourpaint = callPackage ./kolourpaint.nix { };
+
+  kgamma = callPackage ./kgamma.nix { };
+
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     #jovie = callPackage ./accessibility/jovie.nix { };
     kmag = callPackage ./accessibility/kmag.nix { };
diff --git a/pkgs/desktops/kde-4.7/kamera.nix b/pkgs/desktops/kde-4.7/kamera.nix
index aa3446c7558c8..056136ecd1214 100644
--- a/pkgs/desktops/kde-4.7/kamera.nix
+++ b/pkgs/desktops/kde-4.7/kamera.nix
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libgphoto2 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libgphoto2 }:
 
 kde.package {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 libgphoto2 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libgphoto2 ];
 
   meta = {
     description = "KDE camera interface library";
diff --git a/pkgs/desktops/kde-4.7/kgamma.nix b/pkgs/desktops/kde-4.7/kgamma.nix
new file mode 100644
index 0000000000000..017f7f00c7bea
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kgamma.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, libXxf86vm }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libXxf86vm ];
+
+  meta = {
+    description = "KDE monitor calibration tool";
+    license = "GPLv2";
+    kde.name = "kgamma";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kipi-plugins.nix b/pkgs/desktops/kde-4.7/kipi-plugins.nix
new file mode 100644
index 0000000000000..ea237a5d718e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kipi-plugins.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2
+, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2
+, kdepimlibs }:
+
+stdenv.mkDerivation rec {
+  name = "kipi-plugins-1.9.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
+    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+  };
+
+  buildInputs =
+    # Some dependencies are missing because they are very big (OpenCV,
+    # GTK).
+    [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi
+      gettext libxml2 libxslt qjson qca2 kdepimlibs
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.kipi-plugins.org;
+    inherit (kdelibs.meta) platforms;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/kolourpaint.nix b/pkgs/desktops/kde-4.7/kolourpaint.nix
new file mode 100644
index 0000000000000..54565f1d27522
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kolourpaint.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon, qimageblitz }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon qimageblitz ];
+
+  meta = {
+    description = "KDE paint program"; 
+    license = "GPLv2";
+    kde.name = "kolourpaint";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/libkdcraw.nix b/pkgs/desktops/kde-4.7/libkdcraw.nix
new file mode 100644
index 0000000000000..82c4e75e482dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/libkdcraw.nix
@@ -0,0 +1,12 @@
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+
+kde.package {
+
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+
+  meta = {
+    description = "Library for decoding RAW images"; 
+    license = "GPLv2";
+    kde.name = "libkdcraw";
+  };
+}