Merge pull request #51784 from LnL7/darwin-glu

glu: don't use valgrind on darwin
This commit is contained in:
Daiderd Jordan 2018-12-11 23:22:51 +01:00 committed by GitHub
commit 3a621ab787
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -146,10 +146,10 @@ let self = stdenv.mkDerivation {
glproto dri2proto dri3proto presentproto glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC libffi libvdpau libelf libXvMC
libpthreadstubs openssl/*or another sha1 provider*/ libpthreadstubs openssl /*or another sha1 provider*/
valgrind-light python2 python2.pkgs.Mako python2 python2.pkgs.Mako
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]; ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; doCheck = false;