about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa')
-rw-r--r--nixpkgs/pkgs/development/libraries/mesa/default.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 0724da8375e3..b34ca5253a29 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -19,7 +19,7 @@
 , libelfSupport ? stdenv.isLinux, libelf
 , llvmSupport ? true, llvmPackages
 , libglvndSupport ? true, libglvnd
-, valgrindSupport ? stdenv.isLinux, valgrind-light
+, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 }:
 
 with lib;
@@ -41,10 +41,6 @@ assert enableRadv -> libdrmSupport && llvmSupport && libelfSupport;
   - libOSMesa is in $osmesa (~4 MB)
 */
 
-if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
-  throw "${stdenv.system}: unsupported platform for Mesa"
-else
-
 let
   # platforms that have PCIe slots and thus can use most non-integrated GPUs
   pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
@@ -206,7 +202,7 @@ let
         ++ optional vdpauSupport libvdpau
         ++ optional vaSupport libva-minimal
         ++ optional omxBellagioSupport libomxil-bellagio
-        ++ optional valgrindSupport valgrind-light
+        ++ optional withValgrind valgrind-light
 
         ++ optionals (elem "x11" eglPlatforms)
           ((with xorg; [ xorgproto libX11 ]))
@@ -372,7 +368,7 @@ let
         description = "An open source implementation of OpenGL";
         homepage = https://www.mesa3d.org/;
         license = licenses.mit; # X11 variant, in most files
-        platforms = platforms.linux ++ platforms.darwin;
+        platforms = platforms.mesaPlatforms;
         maintainers = with maintainers; [ vcunat ];
       };
     };