From 4ddef40cb938ec937c0082a2b82a8b3369361140 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 4 Nov 2024 04:56:44 +0100 Subject: [PATCH 1/2] agg: disable sdltest on darwin Makes the hydra builders go stuck. https://hydra.nixos.org/build/276814457 --- pkgs/development/libraries/agg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index cd098ae825c2..ac3f9ca951fd 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - (lib.strings.enableFeature stdenv.hostPlatform.isLinux "platform") + (lib.enableFeature stdenv.hostPlatform.isLinux "platform") + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") "--enable-examples=no" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--x-includes=${lib.getDev libX11}/include" From eb2009ec57598911cdfdb6e148abd092fbcb2d9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 4 Nov 2024 05:02:23 +0100 Subject: [PATCH 2/2] dgen-sdl: fix darwin build Disables sdltest, because it times out on hydra. --- pkgs/by-name/dg/dgen-sdl/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/dg/dgen-sdl/package.nix b/pkgs/by-name/dg/dgen-sdl/package.nix index a501139ff47b..172fb5677533 100644 --- a/pkgs/by-name/dg/dgen-sdl/package.nix +++ b/pkgs/by-name/dg/dgen-sdl/package.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + (lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest") "--enable-debug-vdp" "--enable-debugger" "--enable-joystick" @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { "--with-star=no" # Needs ASM support ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-reserved-user-defined-literal"; + meta = with lib; { homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator";