ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

* Renamed the darwin stdenv to powerpc-darwin, since i686-darwin uses stdenv/nix.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10812
This commit is contained in:
Eelco Dolstra 2008-02-21 17:25:10 +00:00
parent 662bea8e0c
commit 1d49f0daff
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/default.nix
View File

@ -46,7 +46,7 @@ rec {
# The Nix build environment. # The Nix build environment.
stdenvNix = (import ./nix) (rec { stdenvNix = (import ./nix) (rec {
stdenv = if system == "i686-darwin" then stdenvDarwin else stdenvNative; # !!! hack stdenv = if system == "i686-darwin" then stdenvPowerpcDarwin else stdenvNative; # !!! hack
pkgs = allPackages { pkgs = allPackages {
inherit system; inherit system;
bootStdenv = removeAttrs stdenv ["gcc"]; # Hack bootStdenv = removeAttrs stdenv ["gcc"]; # Hack
@ -59,9 +59,9 @@ rec {
stdenvLinux = (import ./linux {inherit system allPackages;}).stdenvLinux; stdenvLinux = (import ./linux {inherit system allPackages;}).stdenvLinux;
# Darwin (Mac OS X) standard environment. Very simple for now # powerpc-darwin (Mac OS X) standard environment. Very simple for now
# (essentially it's just the native environment). # (essentially it's just the native environment).
stdenvDarwin = (import ./darwin) { stdenvPowerpcDarwin = (import ./powerpc-darwin) {
stdenv = stdenvInitial; stdenv = stdenvInitial;
inherit genericStdenv gccWrapper; inherit genericStdenv gccWrapper;
}; };
@ -97,7 +97,7 @@ rec {
if stdenvType == "i686-freebsd" then stdenvFreeBSD else if stdenvType == "i686-freebsd" then stdenvFreeBSD else
if stdenvType == "i686-cygwin" then stdenvCygwin else if stdenvType == "i686-cygwin" then stdenvCygwin else
if stdenvType == "i686-mingw" then stdenvMinGW else if stdenvType == "i686-mingw" then stdenvMinGW else
if stdenvType == "powerpc-darwin" then stdenvDarwin else if stdenvType == "powerpc-darwin" then stdenvPowerpcDarwin else
if stdenvType == "i686-darwin" then stdenvNix else if stdenvType == "i686-darwin" then stdenvNix else
stdenvNative; stdenvNative;
} }

0
pkgs/stdenv/darwin/default.nix → pkgs/stdenv/powerpc-darwin/default.nix
View File

0
pkgs/stdenv/darwin/prehook.sh → pkgs/stdenv/powerpc-darwin/prehook.sh
View File