alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-04-01 18:19:44 +00:00
parent 766add2f8a
commit 4a6cfd435e
6 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/kde-4.4/libs/default.nix
View file

@ -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

13
pkgs/desktops/kde-4.4/libs/findqt4.patch
View file

@ -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

1
pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
View file

@ -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";

2
pkgs/development/tools/build-managers/cmake/default.nix
View file

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

13
pkgs/development/tools/build-managers/cmake/findqt4.patch
View file

@ -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

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

@ -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}
}