diff options
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index e628c636397e..d54c19f8380c 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -46,16 +46,19 @@ else let defaultGalliumDrivers = 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"]); + ([ "virgl" "nouveau" ] + ++ (if stdenv.isAarch32 then ["freedreno" "vc4" "etnaviv" "imx"] + else if stdenv.isAarch64 then [ "vc4" ] + else + ([ "svga" "i915" "r300" ] + ++ optionals libelfSupport [ "r600" "radeonsi" ]))); + defaultDriDrivers = optionals (elem "drm" eglPlatforms) - (if (stdenv.isAarch32 || stdenv.isAarch64) - then ["nouveau"] - else ["i915" "i965" "nouveau" "radeon" "r200"]); + ([ "nouveau" ] ++ + optionals (stdenv.isAarch32 || stdenv.isAarch64) + [ "i915" "i965" "radeon" "r200" ]); + defaultVulkanDrivers = optional enableRadv "radeon" ++ (optional (stdenv.isLinux |