diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-10 13:50:21 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-11 09:40:19 +0100 |
| commit | a5f4e22289229a5f6b7341d17c45db98be84d479 (patch) | |
| tree | f3cfa12012ed4eae757178c1f222483b381e5f0f /pkgs | |
| parent | 71161443b44dcf21e0bec919cdd602d3e7e05893 (diff) | |
| download | nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar.gz nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar.bz2 nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar.lz nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar.xz nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.tar.zst nixpkgs-a5f4e22289229a5f6b7341d17c45db98be84d479.zip | |
stdenv: aarch64 is also ARM
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3dfbdd7040f..aadcfcf05a8 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 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] + ++ stdenv.lib.optionals stdenv.isArm [ "--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 f5e716d212c..758e2446d03 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 || stdenv.isAarch64) + if stdenv.isArm then ["nouveau" "freedreno" "vc4" "etnaviv"] else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if stdenv.isArm then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]; defaultVulkanDrivers = - if (stdenv.isArm || stdenv.isAarch64) + if stdenv.isArm then [] else ["intel"] ++ lib.optional enableRadv "radeon"; in diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index cb94db48f4b..1900e404e6d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -397,7 +397,8 @@ let || system == "mips64el-linux"; isArm = system == "armv5tel-linux" || system == "armv6l-linux" - || system == "armv7l-linux"; + || system == "armv7l-linux" + || system == "aarch64-linux"; isAarch64 = system == "aarch64-linux"; isBigEndian = system == "powerpc-linux"; |