From a241abf603e7fe971bdddc7c9454581e26c15d5a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 15:54:24 +0200
Subject: [PATCH] Revert "stdenv: aarch64 is also ARM"

This reverts commit a5f4e22289229a5f6b7341d17c45db98be84d479.

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
---
 pkgs/development/libraries/libdrm/default.nix | 2 +-
 pkgs/development/libraries/mesa/default.nix   | 6 +++---
 pkgs/stdenv/generic/default.nix               | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index aadcfcf05a8..3dfbdd7040f 100644
--- 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
index 758e2446d03..f5e716d212c 100644
--- 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
index 1900e404e6d..cb94db48f4b 100644
--- 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";