Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while

before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

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

pkgs/development/libraries/qt-4/setup-hook.sh

@@ -1,9 +1,8 @@
 export QTDIR=@out@
 
-if [ -z "$normalQt" ]; then
+if [ -n "$includeAllQtDirs" ]; then
   # This helps for g++, but not for moc. And no qt4 package should expect
-  # having all qt4 header files dirs into -I. But the KDE nix expressions want
-  # this.
+  # having all qt4 header files dirs into -I.
   for d in @out@/include/*; do
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
   done

pkgs/development/tools/build-managers/cmake/default.nix

@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw";
   };
 
+  patches = [ ./findqt4.patch ];
+
   postUnpack = ''
     dontUseCmakeConfigure=1
     source $setupHook

pkgs/development/tools/build-managers/cmake/findqt4.patch

@@ -0,0 +1,13 @@
+diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
+index 3bb77d1..7fdbe4a 100644
+--- a/Modules/FindQt4.cmake
++++ b/Modules/FindQt4.cmake
+@@ -579,6 +579,8 @@ IF (QT4_QMAKE_FOUND)
+   FOREACH(QT_MODULE ${QT_MODULES})
+     STRING(TOUPPER ${QT_MODULE} _upper_qt_module)
+     FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR ${QT_MODULE}
++              NO_CMAKE_PATH
++              NO_CMAKE_ENVIRONMENT_PATH
+               PATHS
+               ${QT_HEADERS_DIR}/${QT_MODULE}
+               ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers