SDL_compat: revert breaking upstream change

Fixes several of the build failures that were caused by
<https://github.com/NixOS/nixpkgs/pull/457112>, e.g.:

* https://hydra.nixos.org/build/311791969
* https://hydra.nixos.org/build/311791578
* https://hydra.nixos.org/build/311802072

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
This commit is contained in:
Marcin Serwin
2025-11-10 09:55:59 +01:00
parent 2aa73d4c28
commit 22db7a73e4
+13 -4
View File
@@ -4,6 +4,7 @@
cmake,
darwin,
fetchFromGitHub,
fetchpatch2,
libGLU,
libiconv,
libX11,
@@ -84,10 +85,18 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $out/lib/pkgconfig/sdl12_compat.pc $out/lib/pkgconfig/sdl.pc
'';
# The setup hook scans paths of buildInputs to find SDL related packages and
# adds their include and library paths to environment variables. The sdl-config
# is patched to use these variables to produce correct flags for compiler.
patches = [ ./find-headers.patch ];
patches = [
# The setup hook scans paths of buildInputs to find SDL related packages and
# adds their include and library paths to environment variables. The sdl-config
# is patched to use these variables to produce correct flags for compiler.
./find-headers.patch
# https://github.com/libsdl-org/sdl12-compat/issues/382
(fetchpatch2 {
url = "https://github.com/libsdl-org/sdl12-compat/commit/bef8f7412dd44edc4f7e14dc35d3b20399e25496.patch?full_index=1";
hash = "sha256-5kJawjmA8C3uH3OIXHmqQjnIRtoTJtXmm3iLxG3e1qc=";
})
];
setupHook = ./setup-hook.sh;
passthru.tests = {