Add armv7l support.

svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
parent 6a9ac1f016
commit 82b308bf11
31 changed files with 46 additions and 33 deletions
@@ -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