Added kdegraphics-4.2 closure

svn path=/nixpkgs/trunk/; revision=14114

pkgs/desktops/kde-4.2/default.nix

@@ -28,6 +28,9 @@ rec {
     inherit (pkgs) stdenv fetchurl cmake qt4;
   };
   
+  qca2 = import ./support/qca2 {
+    inherit (pkgs) stdenv fetchurl which qt4;
+  };
 ### LIBS
   kdelibs = import ./libs {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
@@ -60,7 +63,11 @@ rec {
 ### ADDITIONAL
 
   kdegraphics = import ./graphics {
-    inherit (pkgs) stdenv fetchurl cmake;
+    inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends gphoto2;
+    inherit (pkgs) libspectre djvulibre chmlib;
+    inherit (pkgs.xlibs) libXxf86vm;
+    poppler = pkgs.popplerQt4;
     inherit kdelibs;
+    inherit automoc4 phonon strigi qimageblitz soprano qca2;
   };
 }

pkgs/desktops/kde-4.2/graphics/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, gphoto2,
+ libspectre, poppler, djvulibre, chmlib, libXxf86vm,
+ kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}:
+
+stdenv.mkDerivation {
+  name = "kdegraphics-4.2.0";
+  src = fetchurl {
+    url = mirror://kde/stable/4.2.0/src/kdegraphics-4.2.0.tar.bz2;
+    md5 = "8beb6fe5d475d0b0245ea6d4cc7e9732";
+  };
+  buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends gphoto2 libspectre poppler chmlib
+                  stdenv.gcc.libc libXxf86vm
+                  kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
+}

pkgs/desktops/kde-4.2/support/qca2/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, which, qt4}:
+
+stdenv.mkDerivation {
+  name = "qca-2.0.1";
+  src = fetchurl {
+    url = http://delta.affinix.com/download/qca/2.0/qca-2.0.1.tar.bz2;
+    md5 = "a0a87d0b3210e23f8c1713562282b7d6";
+  };
+  buildInputs = [ which qt4 ];
+}

pkgs/development/libraries/poppler/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
 	preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";
 
-  doCheck = true;
+#  doCheck = true;
 
   meta = {
     homepage = http://poppler.freedesktop.org/;

pkgs/top-level/all-packages.nix

@@ -3649,6 +3649,13 @@ let
     qt4Support = getConfig [ "poppler" "qt4Support" ] false;
   };
 
+  popplerQt4 = import ../development/libraries/poppler {
+    inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
+      pkgconfig;
+    inherit (gtkLibs) glib gtk;
+    qt4Support = true;
+  };
+
   popt = import ../development/libraries/popt {
     inherit fetchurl stdenv gettext;
   };