about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/mesa/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-20 21:23:41 +0200
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:03:50 +0000
commit38b51d781543ff8ecbf81d4b45320ee1c413f85c (patch)
tree10b740fb142ba855ce5c75b5bdb59383027be54c /nixpkgs/pkgs/development/libraries/mesa/default.nix
parentfbfcc9fa1c426725f78b2c23a70d9b3453066abf (diff)
downloadnixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar.gz
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar.bz2
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar.lz
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar.xz
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.tar.zst
nixlib-38b51d781543ff8ecbf81d4b45320ee1c413f85c.zip
mesa: build compatible drivers when LLVM disabled
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa/default.nix5
1 files changed, 3 insertions, 2 deletions
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)