summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-08 00:32:12 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-08 00:32:12 +0000
commit4b27d2870197b26b7c170caa333944231715d4a3 (patch)
tree6b781861cb96e9ce0660ca0b904ed3dda1cc6905 /pkgs/stdenv/generic
parent6e86ca940f9cb7fdbbf8663bc5c19af45fbc1e17 (diff)
downloadnixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar.gz
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar.bz2
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar.lz
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar.xz
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.tar.zst
nixpkgs-4b27d2870197b26b7c170caa333944231715d4a3.zip
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/generic')
-rw-r--r--pkgs/stdenv/generic/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 6513c9be7e7..de525d479f9 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -71,7 +71,8 @@ let
         isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin";
         isLinux = result.system == "i686-linux"
                || result.system == "x86_64-linux"
-               || result.system == "powerpc-linux";
+               || result.system == "powerpc-linux"
+               || result.system == "armv5tel-linux";
         isi686 = result.system == "i686-linux"
                || result.system == "i686-darwin"
                || result.system == "i686-freebsd"