diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
| commit | 4b27d2870197b26b7c170caa333944231715d4a3 (patch) | |
| tree | 6b781861cb96e9ce0660ca0b904ed3dda1cc6905 /pkgs/stdenv/default.nix | |
| parent | 6e86ca940f9cb7fdbbf8663bc5c19af45fbc1e17 (diff) | |
Porting changes from stdenv-updates into this branch.
This comes from:
svn diff ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.
trunk@18255 comes from the last time I updated stdenv-updates from trunk.
svn path=/nixpkgs/stdenv-updates2/; revision=18272
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 7f44037c7019..ed8f0e39f5f8 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -54,6 +54,7 @@ rec { stdenv = if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else + if stdenvType == "armv5tel-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 |