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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-10 11:08:54 +01:00
parent 322f87137c 40c567de0f
commit 53d00c3351
540 changed files with 11238 additions and 7081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,20 +25,20 @@
with stdenv.lib;
if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then
if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
let
defaultGalliumDrivers =
optionals (builtins.elem "drm" eglPlatforms)
optionals (elem "drm" eglPlatforms)
(if stdenv.isAarch32
then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
else if stdenv.isAarch64
then ["virgl" "nouveau" "vc4" ]
else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
defaultDriDrivers =
optionals (builtins.elem "drm" eglPlatforms)
optionals (elem "drm" eglPlatforms)
(if (stdenv.isAarch32 || stdenv.isAarch64)
then ["nouveau"]
else ["i915" "i965" "nouveau" "radeon" "r200"]);