diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-10 11:08:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-10 11:08:54 +0100 |
| commit | 53d00c335194e01f536b4a9ff024c8b841e9d334 (patch) | |
| tree | 84f53af51cc1578c01422d8a552779b7d2894689 /pkgs/development/libraries/mesa | |
| parent | 322f87137c018813a9f3d6d9fbdfb208c430f154 (diff) | |
| parent | 40c567de0fb2e72cd9821b4cd84d21debdd33e95 (diff) | |
| download | nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.gz nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.bz2 nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.lz nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.xz nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.tar.zst nixpkgs-53d00c335194e01f536b4a9ff024c8b841e9d334.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2af35444a27..91813b4180e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,20 +25,20 @@ with stdenv.lib; -if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then +if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then throw "unsupported platform for Mesa" else let defaultGalliumDrivers = - optionals (builtins.elem "drm" eglPlatforms) + 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"]); defaultDriDrivers = - optionals (builtins.elem "drm" eglPlatforms) + optionals (elem "drm" eglPlatforms) (if (stdenv.isAarch32 || stdenv.isAarch64) then ["nouveau"] else ["i915" "i965" "nouveau" "radeon" "r200"]); |