* Better stdenv for Darwin: uses gcc, coreutils etc. built in Nix, but

external binutils (i.e., Apple's cctools in /usr/bin).

svn path=/nixpkgs/trunk/; revision=5706
This commit is contained in:
Eelco Dolstra
2006-07-14 11:59:38 +00:00
parent 2881391565
commit dd325103df
5 changed files with 29 additions and 9 deletions
+7 -3
View File
@@ -1,6 +1,6 @@
{stdenv, pkgs, genericStdenv}:
{stdenv, pkgs}:
genericStdenv {
import ../generic {
name = "stdenv-nix";
preHook = ./prehook.sh;
initialPath = (import ../common-path.nix) {pkgs = pkgs;};
@@ -11,7 +11,11 @@ genericStdenv {
nativeTools = false;
nativeGlibc = true;
inherit stdenv;
inherit (pkgs) binutils;
binutils =
if stdenv.system == "i686-darwin" || stdenv.system == "powerpc-darwin" then
import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
else
pkgs.binutils;
gcc = pkgs.gcc.gcc;
shell = pkgs.bash ~ /bin/sh;
};