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:26:24 +0200
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:02:50 +0000
commitd2a7990fca85722f94ffcc10b528d636adcdb901 (patch)
treec1180aeb338b95aabf94514bcf4e9ba3df7c5c44 /nixpkgs/pkgs/development/libraries/mesa/default.nix
parent15c2c4d52d75100a9dba3f12c7f6e90004e51ef2 (diff)
downloadnixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar.gz
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar.bz2
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar.lz
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar.xz
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.tar.zst
nixlib-d2a7990fca85722f94ffcc10b528d636adcdb901.zip
mesa: build compatible drivers when no libelf
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa/default.nix19
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