From 4a6cfd435e9ef9a0ac6871fcf9d4b02a7fdfaefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 1 Apr 2010 18:19:44 +0000 Subject: [PATCH] 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/desktops/kde-4.4/libs/default.nix | 4 ---- pkgs/desktops/kde-4.4/libs/findqt4.patch | 13 ------------- .../kde-4.4/support/qimageblitz/default.nix | 1 - .../tools/build-managers/cmake/default.nix | 2 -- .../tools/build-managers/cmake/findqt4.patch | 13 ------------- .../tools/build-managers/cmake/setup-hook.sh | 1 - 6 files changed, 34 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/libs/findqt4.patch delete mode 100644 pkgs/development/tools/build-managers/cmake/findqt4.patch diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 84ee7a59627..896c444d10e 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; }; - - # The same way as cmake needed a patch for findqt4 to work properly under nix, - # also KDE, because they have their own copy of cmake's findqt4. - patches = [ ./findqt4.patch ]; buildInputs = [ cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt diff --git a/pkgs/desktops/kde-4.4/libs/findqt4.patch b/pkgs/desktops/kde-4.4/libs/findqt4.patch deleted file mode 100644 index a8ba8e31794..00000000000 --- a/pkgs/desktops/kde-4.4/libs/findqt4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake -index 86622fd..e15b3fa 100644 ---- a/cmake/modules/FindQt4.cmake -+++ b/cmake/modules/FindQt4.cmake -@@ -727,6 +727,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/desktops/kde-4.4/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix index 3e352b1f027..b03301e76e8 100644 --- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix +++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { patchPhase = '' cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules ''; - patches = [ ../../libs/findqt4.patch ]; buildInputs = [ cmake qt4 ]; meta = { description = "Graphical effect and filter library for KDE4"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ecf7deafd35..4158c737612 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 43fa5591506..00000000000 --- 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 49a4ad7fd90..71afcefe3cb 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} }