diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-04-23 15:47:31 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-04-23 15:47:31 +0000 |
| commit | 04600bbec1d0902b6aeec4528718f6fc7c3dc040 (patch) | |
| tree | 5ae660e72691c5e49d1784e725d65513aab39237 /pkgs/development/tools/build-managers/cmake | |
| parent | 0a9d954bc6aa8012a1ac8d0f9dafb26a2a3ce1fb (diff) | |
| download | nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.gz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.bz2 nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.lz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.xz nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.tar.zst nixlib-04600bbec1d0902b6aeec4528718f6fc7c3dc040.zip | |
Darwin: Add `mig', `lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. svn path=/nixpkgs/trunk/; revision=33893
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/264.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix index 42fba148eec5..b2695c2ec87c 100644 --- a/pkgs/development/tools/build-managers/cmake/264.nix +++ b/pkgs/development/tools/build-managers/cmake/264.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c -, darwinInstallNameToolUtility }: +}: with stdenv.lib; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { optional (stdenv ? glibc) ./search-path-264.patch; buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ] - ++ optional stdenv.isDarwin darwinInstallNameToolUtility ++ optional useNcurses ncurses ++ optional useQt4 qt4; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 51d6d9a74120..cab217fef97d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4 -, darwinInstallNameToolUtility }: +}: with stdenv.lib; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { optional (stdenv ? glibc) ./search-path.patch; buildInputs = [ curl expat zlib bzip2 libarchive ] - ++ optional stdenv.isDarwin darwinInstallNameToolUtility ++ optional useNcurses ncurses ++ optional useQt4 qt4; |