Revert "stdenv: aarch64 is also ARM"

This reverts commit a5f4e22. Breaks the stdenv build, e.g.: http://hydra.nixos.org/build/50015717 In general, the architectures are different enough that there is no reason to consider both as ARM, just like we don't consider x86_64 as 32-bit x86. cc @fpletz
NixOS · Mar 11, 2017 · a241abf · a241abf
1 parent d6d7968
commit a241abf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
   configureFlags = [ "--disable-valgrind" ]
-    ++ stdenv.lib.optionals stdenv.isArm [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
+    ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
@@ -30,15 +30,15 @@ else
 
 let
   defaultGalliumDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then ["nouveau" "freedreno" "vc4" "etnaviv"]
     else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"];
   defaultVulkanDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then []
     else ["intel"] ++ lib.optional enableRadv "radeon";
 in

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
@@ -397,8 +397,7 @@ let
             || system == "mips64el-linux";
       isArm = system == "armv5tel-linux"
            || system == "armv6l-linux"
-           || system == "armv7l-linux"
-           || system == "aarch64-linux";
+           || system == "armv7l-linux";
       isAarch64 = system == "aarch64-linux";
       isBigEndian = system == "powerpc-linux";