public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "stdenv: aarch64 is also ARM"

Browse Source 
This reverts commit a5f4e22289.

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
This commit is contained in:
Tuomas Tynkkynen
2017-03-11 15:57:51 +02:00
parent d6d796812a
commit a241abf603
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libdrm/default.nix
+1 -1
View File
@@ -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" ];