diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 18:30:18 +0000 |
commit | ef93931efff0323fd13c4270415b578c73b5ef35 (patch) | |
tree | e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/development/libraries/mesa | |
parent | c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff) | |
parent | a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff) | |
download | nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip |
Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 10 |
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 ]; }; }; |