BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mesa: don’t use valgrind-light on aarch32

Browse source 
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
This commit is contained in:
Matthew Bauer 2019-05-08 21:47:11 -04:00
parent 9225890537
commit 476c580605
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/mesa/default.nix
View file

@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook , pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2, python2Packages , libelf, libvdpau, python2, python2Packages
, libglvnd , libglvnd
, enableRadv ? true , enableRadv ? true
, galliumDrivers ? null , galliumDrivers ? null
@ -10,6 +10,7 @@
, vulkanDrivers ? null , vulkanDrivers ? null
, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin , OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
}: }:
/** Packaging design: /** Packaging design:
@ -146,7 +147,8 @@ let self = stdenv.mkDerivation {
libffi libvdpau libelf libXvMC libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/ libpthreadstubs openssl /*or another sha1 provider*/
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ] ++ 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; enableParallelBuilding = true;
doCheck = false; doCheck = false;