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

stdenv: aarch64 is also ARM

Browse Source
This commit is contained in:
Franz Pletz 2017-03-10 13:50:21 +01:00
parent 71161443b4
commit a5f4e22289
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libdrm/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--disable-valgrind" ] 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"; ++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];

6
pkgs/development/libraries/mesa/default.nix
View File

@ -30,15 +30,15 @@ else
let let
defaultGalliumDrivers = defaultGalliumDrivers =
if (stdenv.isArm || stdenv.isAarch64) if stdenv.isArm
then ["nouveau" "freedreno" "vc4" "etnaviv"] then ["nouveau" "freedreno" "vc4" "etnaviv"]
else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"]; else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
defaultDriDrivers = defaultDriDrivers =
if (stdenv.isArm || stdenv.isAarch64) if stdenv.isArm
then ["nouveau"] then ["nouveau"]
else ["i915" "i965" "nouveau" "radeon" "r200"]; else ["i915" "i965" "nouveau" "radeon" "r200"];
defaultVulkanDrivers = defaultVulkanDrivers =
if (stdenv.isArm || stdenv.isAarch64) if stdenv.isArm
then [] then []
else ["intel"] ++ lib.optional enableRadv "radeon"; else ["intel"] ++ lib.optional enableRadv "radeon";
in in

3
pkgs/stdenv/generic/default.nix
View File

@ -397,7 +397,8 @@ let
|| system == "mips64el-linux"; || system == "mips64el-linux";
isArm = system == "armv5tel-linux" isArm = system == "armv5tel-linux"
|| system == "armv6l-linux" || system == "armv6l-linux"
|| system == "armv7l-linux"; || system == "armv7l-linux"
|| system == "aarch64-linux";
isAarch64 = system == "aarch64-linux"; isAarch64 = system == "aarch64-linux";
isBigEndian = system == "powerpc-linux"; isBigEndian = system == "powerpc-linux";