cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libepoxy: move test-disable to postPatch

Browse source 
Fixes the Hydra failures on staging-next. #263535.

https://github.com/NixOS/nixpkgs/pull/263535#issuecomment-1784141355.
This commit is contained in:
Randy Eckenrode 2023-10-29 17:50:21 -04:00
parent 64070c2fda
commit cca0912245
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/libepoxy/default.nix
View file

@ -31,6 +31,15 @@ stdenv.mkDerivation rec {
''
+ 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" ];
@ -55,15 +64,6 @@ stdenv.mkDerivation rec {
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;
meta = with lib; {