Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc. svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
@@ -59,21 +59,5 @@ stdenv.mkDerivation (rec {
|
||||
sed -i coregrind/link_tool_exe_darwin.in \
|
||||
-e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
# Shamelessly drag in MIG.
|
||||
'' mkdir -p "$TMPDIR/impure-deps/bin"
|
||||
|
||||
# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
|
||||
# let it see the impure directories.
|
||||
cat > "$TMPDIR/impure-deps/bin/mig" <<EOF
|
||||
#!/bin/sh
|
||||
export PATH="/usr/bin:/bin:\$PATH"
|
||||
exec /usr/bin/mig "\$@"
|
||||
EOF
|
||||
chmod +x "$TMPDIR/impure-deps/bin/mig"
|
||||
|
||||
export PATH="$TMPDIR/impure-deps/bin:$PATH"
|
||||
'';
|
||||
}
|
||||
else {}))
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user