diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-12 18:39:09 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-12 18:39:09 +0000 |
commit | dae3eb23830cce8a7dacebf288655f3c27489666 (patch) | |
tree | cbd0307608b442b66e90b54cbec47379d3b07d7a /pkgs/development/tools/build-managers | |
parent | ef0cd29eb0e751af822c3deb4981c2b85d472a94 (diff) | |
parent | 362f811a7aeb9296017519c977a5afd774258c94 (diff) |
Merging from trunk.
I resolved two conflicts: - cmake (trunk fixes + stdenv-updates cross-compiling) - all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44) svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 6 | ||||
-rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 12764e77303d1..ecf7deafd35f2 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,10 +1,10 @@ {fetchurl, stdenv, replace, ncurses}: stdenv.mkDerivation rec { - name = "cmake-2.6.4"; + name = "cmake-2.8.0"; # We look for cmake modules in .../share/cmake-${majorVersion}/Modules. - majorVersion = "2.6"; + majorVersion = "2.8"; setupHook = ./setup-hook.sh; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.cmake.org/files/v${majorVersion}/${name}.tar.gz"; - sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw"; + sha256 = "0va7kxczqb920n61xnyhr99ajs4v05mssk4n0p6z55yvr9g62zc4"; }; patches = [ ./findqt4.patch ]; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 5fdd66aaace02..892af7735187d 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -39,6 +39,9 @@ cmakeConfigurePhase() cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-g++ -DCMAKE_C_COMPILER=$crossConfig-gcc $cmakeFlags" fi + # Avoid cmake resetting the rpath of binaries, on make install + cmakeFlags="-DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]} |