From 922589053724885437b2c75257ab36383f95c378 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:46:31 -0400 Subject: mesa: use platforms instead of throw mesaPlatforms can be used in the platforms attr. --- pkgs/development/libraries/mesa/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/development/libraries/mesa') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c9ce97849e1..05c5116a01d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,10 +25,6 @@ with stdenv.lib; -if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else - let defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) @@ -273,7 +269,7 @@ let self = stdenv.mkDerivation { 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 ]; }; }; -- cgit 1.4.1 From 476c580605c071cbadbd8715984b7da08f58d303 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 8 May 2019 21:47:11 -0400 Subject: mesa: don’t use valgrind-light on aarch32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit valgrind-light doesn’t appear to work correctly on aarch32. It’s also not a required dependency on mesa, so in the future we may be able to disable it for other platforms --- pkgs/development/libraries/mesa/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/mesa') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 05c5116a01d..79947ae2f15 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2, python2Packages +, libelf, libvdpau, python2, python2Packages , libglvnd , enableRadv ? true , galliumDrivers ? null @@ -10,6 +10,7 @@ , vulkanDrivers ? null , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin +, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light }: /** Packaging design: @@ -146,7 +147,8 @@ let self = stdenv.mkDerivation { libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + ++ lib.optional withValgrind valgrind-light; enableParallelBuilding = true; doCheck = false; -- cgit 1.4.1