Skip to content

Commit 978d992

Browse files
committed
Merge #210961: libepoxy: disable more cgl tests on x86_64-darwin
2 parents aca1010 + f42e226 commit 978d992

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

pkgs/development/libraries/libepoxy/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@ stdenv.mkDerivation rec {
5656

5757
NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"'';
5858

59-
# cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?)
59+
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
6060
preCheck = lib.optionalString stdenv.isDarwin ''
6161
substituteInPlace ../test/meson.build \
6262
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
63+
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
64+
substituteInPlace ../test/meson.build \
65+
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
6366
'';
6467

6568
doCheck = true;

0 commit comments

Comments
 (0)