diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-01 18:19:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-01 18:19:44 +0000 |
| commit | 4a6cfd435e9ef9a0ac6871fcf9d4b02a7fdfaefa (patch) | |
| tree | 9b0b54af5602f8289115f255793e434dd8a7530f /pkgs/development/tools/build-managers | |
| parent | 766add2f8a1eb2d11a21ed793dd060f3d95fef3b (diff) | |
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
Diffstat (limited to 'pkgs/development/tools/build-managers')
3 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ecf7deafd35f2..4158c737612cf 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/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 diff --git a/pkgs/development/tools/build-managers/cmake/findqt4.patch b/pkgs/development/tools/build-managers/cmake/findqt4.patch deleted file mode 100644 index 43fa5591506cc..0000000000000 --- a/pkgs/development/tools/build-managers/cmake/findqt4.patch +++ /dev/null @@ -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 diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 49a4ad7fd90da..71afcefe3cb6f 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/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} } |