Made kde-4.2 packages work, adding the proper derivation attribute to get all qt include

paths into NIX_CFLAGS_COMPILE. This helps build kde42 packages, because they have a broken
FindQt4.cmake, which doesn't find properly the qt4 header files.

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

29 files changed, 31 insertions, 0 deletions

diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix
index eb00460c621f..ae1ef8eea387 100644
--- a/pkgs/desktops/kde-4.2/admin/default.nix
+++ b/pkgs/desktops/kde-4.2/admin/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
   };
   builder = ./builder.sh;
   inherit system_config_printer;
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl
                   kdelibs kdepimlibs kdebindings automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix
index 793017eb542c..7863da045605 100644
--- a/pkgs/desktops/kde-4.2/artwork/default.nix
+++ b/pkgs/desktops/kde-4.2/artwork/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdeartwork-4.2.3.tar.bz2;
     sha1 = "f438060107caeb5bddd1e23a1417edf4e8476158";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl xscreensaver
                   kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
 }
diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix
index 19a501a7955b..884353f9f2a2 100644
--- a/pkgs/desktops/kde-4.2/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     sha1 = "f3adc26e6b313a14af1e4208bc539017c8dcccd7";
   };
 /*  CLUCENE_HOME=cluceneCore;*/
+  includeAllQtDirs=true;
   buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs
                   automoc4 phonon strigi soprano cluceneCore ];
 }
diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix
index 0771308725d9..346dba5fa17a 100644
--- a/pkgs/desktops/kde-4.2/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdebase-workspace-4.2.3.tar.bz2;
     sha1 = "0c92579c651c5a08ff6440762eb5c2ad9d5bc0ad";
   };
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc
                   libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix
index a125c6d6a699..3edf4c3268cf 100644
--- a/pkgs/desktops/kde-4.2/base/default.nix
+++ b/pkgs/desktops/kde-4.2/base/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdebase-4.2.3.tar.bz2;
     sha1 = "bc05bf836ff2aea64c0806be161b8ec8b9a5a42b";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394
                   automoc4 phonon strigi qimageblitz soprano ];
 }
diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix
index 375537633677..267789db2698 100644
--- a/pkgs/desktops/kde-4.2/bindings/default.nix
+++ b/pkgs/desktops/kde-4.2/bindings/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     sha1 = "d8e5ddf5e993124e0250c3e9a9de52264ca5ca7c";
   };
   builder = ./builder.sh;
+  includeAllQtDirs=true;
   buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
                   libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
 }
diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix
index 94bcc126a266..0b31988315c0 100644
--- a/pkgs/desktops/kde-4.2/edu/default.nix
+++ b/pkgs/desktops/kde-4.2/edu/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdeedu-4.2.3.tar.bz2;
     sha1 = "32a3ddef04f3e0d7d110f616caf98c4537ee8bb8";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml
                   kdelibs automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix
index a631149beb5a..b841c1ed9325 100644
--- a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2;
     md5 = "98b78372ec6ea3432faba356c90c6dbe";
   };
+  includeAllQtDirs=true;
   inherit mysql loudmouth;
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth
diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix
index b088cf0eb7f0..25e98ec29c42 100644
--- a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.3.0.tar.bz2;
     sha256 = "d219c430c98d75d07258057e78c29042777e0368eded7494499361031ac63649";
   };
+  includeAllQtDirs=true;
   builder = ./builder.sh;
   inherit subversion;
   buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix b/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix
index 8fa3b651c9db..74444a32a991 100644
--- a/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation {
     url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1.tar.bz2;
     sha256 = "d10df9c31f540ab9442b75e0be0ed2cff9313de9004a4a8acbe3dbed79d5fddb";
   };
+  includeAllQtDirs=true;
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/extragear/koffice/default.nix b/pkgs/desktops/kde-4.2/extragear/koffice/default.nix
index 21f371868101..872e2ab7e956 100644
--- a/pkgs/desktops/kde-4.2/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/koffice/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/koffice-2.0.0/src/koffice-2.0.0.tar.bz2;
     sha256 = "8cfc35acf4b6d306245e7705899167fd1b67a861136551ab02a0cd7542eb72e9";
   }; 
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
                   poppler gsl gmm wv2 libwpd
diff --git a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix
index 35933a01523d..d740b4dd3f60 100644
--- a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz;
     sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix
index fc7a3cbe97d0..0a60fa82d29e 100644
--- a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix
+++ b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = http://ktorrent.org/downloads/3.2.1/ktorrent-3.2.1.tar.bz2;
     sha256 = "e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb";
   };
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include";
   buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc
diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix
index 13d903981106..08c0cb57f73f 100644
--- a/pkgs/desktops/kde-4.2/games/default.nix
+++ b/pkgs/desktops/kde-4.2/games/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdegames-4.2.3.tar.bz2;
     sha1 = "74e0a41cdce34bead787a7c4586d3dae7aa06cc9";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ];
 }
diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix
index 5e78f3918752..c9c02ed7b6fc 100644
--- a/pkgs/desktops/kde-4.2/graphics/default.nix
+++ b/pkgs/desktops/kde-4.2/graphics/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdegraphics-4.2.3.tar.bz2;
     sha1 = "1304fe7562e41fad30841dfda4b42197e3d95b3d";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib
                   stdenv.gcc.libc libXxf86vm
                   kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ];
diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix
index e7926b801016..1a00e23e14ca 100644
--- a/pkgs/desktops/kde-4.2/libs/default.nix
+++ b/pkgs/desktops/kde-4.2/libs/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
     sha1 = "c4cde3ea347d89d79ffdead203c85b1c2d1f8757";
   };
   
+  includeAllQtDirs = true;
+
   buildInputs = [
     cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt
     shared_mime_info giflib jasper /* openexr */ aspell avahi
diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix
index 171d047bfbb8..0fef39b93e6b 100644
--- a/pkgs/desktops/kde-4.2/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.2/multimedia/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdemultimedia-4.2.3.tar.bz2;
     sha1 = "ebf2d0f04dd8ab2c10a3505a2c7a3468173e369e";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia
                   kdelibs automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix
index 9df68b39bfb0..132820efb963 100644
--- a/pkgs/desktops/kde-4.2/network/default.nix
+++ b/pkgs/desktops/kde-4.2/network/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdenetwork-4.2.3.tar.bz2;
     sha1 = "633432d049794f50143ed60197f6f0b5ac9011a7";
   };
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                   libvncserver tapioca_qt libmsn
diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix
index 8f9845886dfc..5e950df3c9cf 100644
--- a/pkgs/desktops/kde-4.2/pim/default.nix
+++ b/pkgs/desktops/kde-4.2/pim/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdepim-4.2.3.tar.bz2;
     sha1 = "9d46fe2ce1bf183cce82d0d60a9a29ec3c53832f";
   };
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   builder = ./builder.sh;  
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix
index 200eadd607a4..4735cd0b44d0 100644
--- a/pkgs/desktops/kde-4.2/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdepimlibs-4.2.3.tar.bz2;
     sha1 = "3b12d5974bfbc384e3c986328a7bb5b1b6b50361";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap
                   kdelibs automoc4 phonon akonadi ];
 }
diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
index 6e8f981e23d2..0277e832d186 100644
--- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
   };
   inherit kdebase_workspace;
   builder = ./builder.sh;
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl python shared_mime_info
                   kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix
index c7673d50442b..2ce570d68e27 100644
--- a/pkgs/desktops/kde-4.2/sdk/default.nix
+++ b/pkgs/desktops/kde-4.2/sdk/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdesdk-4.2.3.tar.bz2;
     sha1 = "cf24ae63e6ee4ed875f580a7dfd8aa6d822d9b47";
   };
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   builder=./builder.sh;
   inherit aprutil;
diff --git a/pkgs/desktops/kde-4.2/support/akonadi/default.nix b/pkgs/desktops/kde-4.2/support/akonadi/default.nix
index e006955272fd..760260a68760 100644
--- a/pkgs/desktops/kde-4.2/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.2/support/akonadi/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = http://download.akonadi-project.org/akonadi-1.1.2.tar.bz2;
     sha256 = "1km5mbcsx8xbb327lbva1pm8a8mjai64kqxww1qzbxz9a20w3css";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 ];
 }
diff --git a/pkgs/desktops/kde-4.2/support/phonon/default.nix b/pkgs/desktops/kde-4.2/support/phonon/default.nix
index 35bfd838db85..464b46847437 100644
--- a/pkgs/desktops/kde-4.2/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.2/support/phonon/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2;
     sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
   };
+  includeAllQtDirs = true;
   buildInputs = [ cmake
                   libXau libXdmcp
                   qt4 pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib
diff --git a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix
index 8e3dd70e2806..e5fb050ebaa7 100644
--- a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix
+++ b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2;
     md5 = "cb87c7f1c0455e8984ee4830f1e749cf";
   };
+  includeAllQtDirs = true;
   buildInputs = [ cmake qt4 ];
 }
diff --git a/pkgs/desktops/kde-4.2/support/strigi/default.nix b/pkgs/desktops/kde-4.2/support/strigi/default.nix
index 1e50dad9e167..e95556d0eb36 100644
--- a/pkgs/desktops/kde-4.2/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.2/support/strigi/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2;
     md5 = "324fd9606ac77765501717ff92c04f9a";
   };
+
+  includeAllQtDirs = true;
   
   CLUCENE_HOME = cluceneCore;
   
diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix
index 474ce8b67fef..663230a791bb 100644
--- a/pkgs/desktops/kde-4.2/toys/default.nix
+++ b/pkgs/desktops/kde-4.2/toys/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdetoys-4.2.3.tar.bz2;
     sha1 = "cb84d7b8da85ed82972a4c99065644532cf12d6d";
   };
+  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
 }
diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix
index f1fdb591257e..9cc946151f4c 100644
--- a/pkgs/desktops/kde-4.2/utils/default.nix
+++ b/pkgs/desktops/kde-4.2/utils/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
   };
   builder = ./builder.sh;
   inherit system_config_printer;
+  includeAllQtDirs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl
                   kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ];
diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix
index fdf3047651a0..02599ce3d91b 100644
--- a/pkgs/desktops/kde-4.2/webdev/default.nix
+++ b/pkgs/desktops/kde-4.2/webdev/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.2.3/src/kdewebdev-4.2.3.tar.bz2;
     sha1 = "737f6876d17da45e8dc855d47973ab8aa91827e3";
   };
+  includeAllQtLibs=true;
   CMAKE_PREFIX_PATH=kdepimlibs;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
 }