From 4688f4078fa655fa3e56a8a4b2591fb195a7eceb Mon Sep 17 00:00:00 2001 From: Jona Stubbe Date: Wed, 22 Aug 2018 23:48:38 +0200 Subject: restructure driver selection to show conditions for which each driver is selected --- pkgs/development/libraries/mesa/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2f8a4bda88a..6787a4dddbb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -29,16 +29,18 @@ else let inherit (stdenv) hostPlatform; - defaultGalliumDrivers = [ "virgl" "nouveau" ] - ++ (if hostPlatform.isAarch32 || hostPlatform.isAarch64 then - [ "vc4" ] - ++ lib.optionals hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] - else - [ "r300" "r600" "radeonsi"] - ++ lib.optionals hostPlatform.isx86 [ "i915" "svga" ] - ); - defaultDriDrivers = [ "nouveau" ] - ++ lib.optionals (!hostPlatform.isAarch32 && !hostPlatform.isAarch64) [ "radeon" "r200" ] + # platforms that have PCIe slots and thus can use most non-integrated GPUs + pciePlatform = !hostPlatform.isAarch32 && !hostPlatform.isAarch64; + defaultGalliumDrivers = [ "virgl" ] + ++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ] + ++ lib.optionals (pciePlatform || hostPlatform.isAarch32 || hostPlatform.isAarch64) [ "nouveau" ] + ++ lib.optionals hostPlatform.isx86 [ "i915" "svga" ] + ++ lib.optionals (hostPlatform.isAarch32 || hostPlatform.isAarch64) [ "vc4" ] + ++ lib.optionals hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ] + ; + defaultDriDrivers = [ ] + ++ lib.optionals pciePlatform [ "radeon" "r200" ] + ++ lib.optionals (pciePlatform || hostPlatform.isAarch32 || hostPlatform.isAarch64) [ "nouveau" ] ++ lib.optionals hostPlatform.isx86 [ "i915" "i965" ]; defaultVulkanDrivers = lib.optional hostPlatform.isx86 "intel" -- cgit 1.4.1