diff options
Diffstat (limited to 'pkgs/stdenv/default.nix')
-rw-r--r-- | pkgs/stdenv/default.nix | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index f5f47427f659..d8bab3c42068 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -17,12 +17,9 @@ assert system != "i686-cygwin" -> system == stdenvType; rec { - gccWrapper = import ../build-support/gcc-wrapper; - genericStdenv = import ./generic; - # Trivial environment used for building other environments. - stdenvInitial = (import ./initial) { + stdenvInitial = import ./initial { name = "stdenv-initial"; inherit system; }; @@ -33,9 +30,8 @@ rec { # i.e., the stuff in /bin, /usr/bin, etc. This environment should # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). - stdenvNative = (import ./native) { - stdenv = stdenvInitial; - inherit genericStdenv gccWrapper; + stdenvNative = import ./native { + inherit stdenvInitial; }; stdenvNativePkgs = allPackages { @@ -45,13 +41,9 @@ rec { # The Nix build environment. - stdenvNix = (import ./nix) (rec { - stdenv = if system == "i686-darwin" then stdenvPowerpcDarwin else stdenvNative; # !!! hack - pkgs = allPackages { - inherit system; - bootStdenv = removeAttrs stdenv ["gcc"]; # Hack - noSysDirs = false; - }; + stdenvNix = import ./nix (rec { + stdenv = stdenvNative; + pkgs = stdenvNativePkgs; }); @@ -59,32 +51,8 @@ rec { stdenvLinux = (import ./linux {inherit system allPackages;}).stdenvLinux; - # powerpc-darwin (Mac OS X) standard environment. Very simple for now - # (essentially it's just the native environment). - stdenvPowerpcDarwin = (import ./powerpc-darwin) { - stdenv = stdenvInitial; - inherit genericStdenv gccWrapper; - }; - - - # FreeBSD standard environment. Right now this is more or less the - # same as the native environemnt. Eventually we'll want a pure - # environment similar to stdenvLinux. - stdenvFreeBSD = (import ./freebsd) { - stdenv = stdenvInitial; - inherit genericStdenv gccWrapper; - }; - - - # Cygwin standard environment. - stdenvCygwin = (import ./cygwin) { - stdenv = stdenvInitial; - inherit genericStdenv gccWrapper; - }; - - # MinGW/MSYS standard environment. - stdenvMinGW = (import ./mingw) { + stdenvMinGW = import ./mingw { inherit system; }; @@ -94,10 +62,7 @@ rec { if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else if stdenvType == "powerpc-linux" then stdenvLinux else - if stdenvType == "i686-freebsd" then stdenvFreeBSD else - if stdenvType == "i686-cygwin" then stdenvCygwin else if stdenvType == "i686-mingw" then stdenvMinGW else - if stdenvType == "powerpc-darwin" then stdenvPowerpcDarwin else if stdenvType == "i686-darwin" then stdenvNix else stdenvNative; } |