diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 14:10:49 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 14:10:49 +0100 |
| commit | 72684fb42fc2a5da68746098eb85fcc4935e9b3d (patch) | |
| tree | eabf0c6bcd4356e8f670412fd140d0ef619b0437 /pkgs/stdenv/default.nix | |
| parent | 4b48d05c58bb97c016c05f4014ac3c32f7f2d548 (diff) | |
| download | nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar.gz nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar.bz2 nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar.lz nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar.xz nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.tar.zst nixpkgs-72684fb42fc2a5da68746098eb85fcc4935e9b3d.zip | |
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index c454204f897..8e0da288eec 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -43,13 +43,13 @@ rec { # Linux standard environment. stdenvLinux = (import ./linux {inherit system allPackages platform;}).stdenvLinux; - + # MinGW/MSYS standard environment. stdenvMinGW = import ./mingw { inherit system; }; - + # Select the appropriate stdenv for the platform `system'. stdenv = if stdenvType == "i686-linux" then stdenvLinux else @@ -59,7 +59,6 @@ rec { if stdenvType == "mips64el-linux" then stdenvLinux else if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "i686-mingw" then stdenvMinGW else - if stdenvType == "i686-darwin" then stdenvNix else if stdenvType == "x86_64-darwin" then stdenvNix else stdenvNative; } |