Merge #264242: libepoxy: move test-disable to postPatch

...into staging-next

Changed files
+9 -9
pkgs
development
libraries
libepoxy
+9 -9
pkgs/development/libraries/libepoxy/default.nix
···
''
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
'';
outputs = [ "out" "dev" ];
···
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"'';
-
-
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
-
preCheck = lib.optionalString stdenv.isDarwin ''
-
substituteInPlace ../test/meson.build \
-
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
-
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
-
substituteInPlace ../test/meson.build \
-
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
-
'';
doCheck = true;
···
''
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
+
''
+
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
+
+ lib.optionalString stdenv.isDarwin ''
+
substituteInPlace test/meson.build \
+
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
+
''
+
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+
substituteInPlace test/meson.build \
+
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
'';
outputs = [ "out" "dev" ];
···
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"'';
doCheck = true;