diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-11 15:54:24 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-11 15:57:51 +0200 |
| commit | a241abf603e7fe971bdddc7c9454581e26c15d5a (patch) | |
| tree | 022884d7064cfa089884c8f84b083243a43ced62 /pkgs/development/libraries/libdrm | |
| parent | d6d796812a388be1461eb624cfde60b1036c585a (diff) | |
| download | nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar.gz nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar.bz2 nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar.lz nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar.xz nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.tar.zst nixpkgs-a241abf603e7fe971bdddc7c9454581e26c15d5a.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/libdrm')
| -rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 2 |
1 files changed, 1 insertions, 1 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" ]; |