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

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

svn path=/nixpkgs/trunk/; revision=33893

2 files changed, 21 insertions, 2 deletions

diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
index 2e2e125c6495..f412ee7caf09 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
@@ -1,6 +1,16 @@
 source $stdenv/setup
 
 mkdir -p $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do 
-    ln -s /usr/bin/$i $out/bin/
+for i in $binaries
+do 
+    ln -s "/usr/bin/$i" "$out/bin/"
 done
+
+# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
+# let it see the impure directories.
+cat > "$out/bin/mig" <<EOF
+#!/bin/sh
+export PATH="/usr/bin:/bin:\$PATH"
+exec /usr/bin/mig "\$@"
+EOF
+chmod +x "$out/bin/mig"
diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix b/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
index e4f0e3e1dd1e..8fed8183ec56 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
@@ -2,5 +2,14 @@
 
 stdenv.mkDerivation {
   name = "native-darwin-cctools-wrapper";
+
+  # Standard binaries normally found under /usr/bin (MIG is omitted here, and
+  # handled specially in ./builder.sh).
+  binaries =
+    [ "ar" "as" "c++filt" "gprof" "ld" "nm" "nmedit" "ranlib"
+      "size" "strings" "strip" "dsymutil" "libtool" "lipo"
+      "install_name_tool" "arch" "sw_vers"
+    ];
+
   builder = ./builder.sh;
 }