Skip to content

SDL_compat: revert breaking upstream change #460292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhendric merged 1 commit into from
Nov 10, 2025
Merged

SDL_compat: revert breaking upstream change #460292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pkgs/by-name/sd/SDL_compat/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
cmake,
darwin,
fetchFromGitHub,
fetchpatch2,
libGLU,
libiconv,
libX11,
Expand Down Expand Up @@ -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 = {
Expand Down
Loading