Add armv7l support.

svn path=/nixpkgs/trunk/; revision=33798

9 files changed, 11 insertions, 11 deletions

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index cc95a6cff16..da45b39cee1 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # We get a warning in armv5tel-linux and the fuloong2f,
   # so we disable -Werror in it
-  patchPhase = if (stdenv.system == "armv5tel-linux" ||
+  patchPhase = if (stdenv.isArm ||
     stdenv.system == "mips64el-linux")
     then ''
       sed -i s/-Werror// src/Makefile.am
diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix
index 32daf5633f7..c5926ff2e47 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     abort "don't know what the kernel include directory is called for this platform";
 
   buildInputs = [perl];
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
index fdbe6cf1bce..b576b68773c 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.system == "mips64el-linux" then "mips" else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
index a7ec522b3d6..a2fc597eaac 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index f5fec3d8620..3fb5ef8ef2d 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
     if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
     abort "don't know what the kernel include directory is called for this platform";
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 223a38da54e..9e8ee74acb1 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -46,7 +46,7 @@
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-  || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux";
+  || stdenv.isArm || stdenv.system == "mips64el-linux";
 
 assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
 
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
     if userModeLinux then "um" else
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "armv5tel-linux" then "arm" else
+    if stdenv.isArm then "arm" else
     if stdenv.system == "mips64el-linux" then "mips" else
     abort "Platform ${stdenv.system} is not supported.";
 
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 6ac14095103..d7d4f1a43d4 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ flex ];
   buildInputs = [ cracklib ]
     ++ stdenv.lib.optional
-      (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux")
+      (stdenv.isArm && stdenv.system != "mips64el-linux")
       libxcrypt;
 
   crossAttrs = {
-    # Skip libxcrypt cross-building, as it fails for mips and armv5tel
+    # Skip libxcrypt cross-building, as it fails for mips and arm
     propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
     preConfigure = preConfigure + ''
       ar x ${flex.hostDrv}/lib/libfl.a
diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
index d48598afd0d..c2eec4a2e4b 100644
--- a/pkgs/os-specific/linux/pam_unix2/default.nix
+++ b/pkgs/os-specific/linux/pam_unix2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
   };
 
-  buildInputs = [ pam ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt;
+  buildInputs = [ pam ] ++ stdenv.lib.optional (!stdenv.isArm) libxcrypt;
 
   meta = {
     homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix
index 41b17777edc..795826cf6bf 100644
--- a/pkgs/os-specific/linux/udev/173.nix
+++ b/pkgs/os-specific/linux/udev/173.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       url = https://bugs.archlinux.org/task/25356?getfile=7281;
       sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
     })] ++
-    stdenv.lib.optional (stdenv.system == "armv5tel-linux") ./pre-accept4-kernel.patch;
+    stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch;
 
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;