From fa9f9f8361dcc87cbc496d76ff0cd6a40083c58f Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 2 Dec 2022 17:05:27 -0700 Subject: [PATCH] mesa: Actually build more Vulkan drivers on aarch64-linux If `auto` exists, the entire list of Vulkan drivers is replaced so our additions aren't honored: Co-authored-by: K900 --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bcc34905a23f..113f3be326a3 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , vulkan-loader, glslang , galliumDrivers ? ["auto"] # upstream Mesa defaults to only enabling swrast (aka lavapipe) on aarch64 for some reason, so force building the others -, vulkanDrivers ? [ "auto" ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "broadcom" "freedreno" "panfrost" ] +, vulkanDrivers ? if (stdenv.isLinux && stdenv.isAarch64) then [ "swrast" "broadcom" "freedreno" "panfrost" ] else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin , OpenGL, Xplugin