public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Darwin: Add mig', lipo', etc. to `stdenvNative'.

Browse Source 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
Ludovic Courtès
2012-04-23 15:47:31 +00:00
parent 0a9d954bc6
commit 04600bbec1
31 changed files with 57 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/cmake/264.nix
View File

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

3
pkgs/development/tools/build-managers/cmake/default.nix
View File

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