From 38b51d781543ff8ecbf81d4b45320ee1c413f85c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 20 Apr 2019 21:23:41 +0200 Subject: mesa: build compatible drivers when LLVM disabled --- nixpkgs/pkgs/development/libraries/mesa/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix') diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index f9d022eb3602..5c17901faaed 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -51,8 +51,9 @@ let ++ (if stdenv.isAarch32 then ["freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then [ "vc4" ] else - ([ "svga" "i915" "r300" ] - ++ optionals libelfSupport [ "r600" "radeonsi" ]))); + ([ "svga" "i915" ] + ++ optionals llvmSupport ([ "r300" ]) + ++ optionals libelfSupport [ "r600" "radeonsi" ]))); defaultDriDrivers = optionals (elem "drm" eglPlatforms) -- cgit 1.4.1