From cca0912245b04da89f7c97ad65e35581336ba7e9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 29 Oct 2023 17:50:21 -0400 Subject: [PATCH] libepoxy: move test-disable to postPatch Fixes the Hydra failures on staging-next. #263535. https://github.com/NixOS/nixpkgs/pull/263535#issuecomment-1784141355. --- .../development/libraries/libepoxy/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 6c7b55914296..cd98e2229fe2 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -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; {