Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module.

That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

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

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

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

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

@@ -1,13 +0,0 @@
-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

pkgs/development/tools/build-managers/cmake/setup-hook.sh

@@ -9,7 +9,6 @@ fixCmakeFiles()
     local replaceArgs
     echo "fixing cmake files"
     replaceArgs="-e -f -L -T /usr /FOO"
-    replaceArgs="$replaceArgs -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\""
     find $1 -type f -name "*.cmake" -print0 | xargs -0 replace-literal ${replaceArgs}
 }