diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 84ee7a596279..896c444d10e4 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 a8ba8e31794d..000000000000 --- 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 3e352b1f0276..b03301e76e81 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 ecf7deafd35f..4158c737612c 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 43fa5591506c..000000000000 --- 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 49a4ad7fd90d..71afcefe3cb6 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} }