diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-25 13:27:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-25 13:27:43 +0000 |
| commit | b831b236ba21c7bb259066a7b7d5be846eed23c9 (patch) | |
| tree | 00f92ee098adfee43f149ccd9b3139a36594f6e1 /pkgs/stdenv/default.nix | |
| parent | 4f03dec496afc166813e4233afbf864903840fb5 (diff) | |
| download | nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar.gz nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar.bz2 nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar.lz nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar.xz nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.tar.zst nixlib-b831b236ba21c7bb259066a7b7d5be846eed23c9.zip | |
* Use the pure stdenv on x86_64.
svn path=/nixpkgs/trunk/; revision=6849
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index ab954416a5f4..46a991e7a666 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -90,11 +90,12 @@ rec { # Select the appropriate stdenv for the platform `system'. stdenv = - if stdenvType == "i686-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 stdenvDarwin - else if stdenvType == "i686-darwin" then stdenvNix - else stdenvNative; + if stdenvType == "i686-linux" then stdenvLinux else + if stdenvType == "x86_64-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 stdenvDarwin else + if stdenvType == "i686-darwin" then stdenvNix else + stdenvNative; } |