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

1 files changed, 2 insertions, 3 deletions

diff --git a/pkgs/development/libraries/qt-4/setup-hook.sh b/pkgs/development/libraries/qt-4/setup-hook.sh
index 6e0bbfe7f45..f9ecacbbb7d 100644
--- a/pkgs/development/libraries/qt-4/setup-hook.sh
+++ b/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