From e253e326e04aedee95f062982aa0cda903f24d99 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 11 Nov 2025 15:27:39 +0100 Subject: [PATCH] sdl2-compat: revert breaking upstream change Fixes segmentation fault in Dwarf Fortress. See https://github.com/NixOS/nixpkgs/pull/457099#issuecomment-3517117420 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl2-compat/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 0aec5ddf963f..e16eb5927cec 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -2,6 +2,7 @@ cmake, lib, fetchFromGitHub, + fetchpatch2, ninja, sdl3, stdenv, @@ -71,7 +72,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - patches = [ ./find-headers.patch ]; + patches = [ + ./find-headers.patch + + # https://github.com/libsdl-org/sdl2-compat/pull/545 + (fetchpatch2 { + url = "https://github.com/libsdl-org/sdl2-compat/commit/b799076c72c2492224e81544f58f92b737cccbd3.patch?full_index=1"; + hash = "sha256-fAc8yBlT+XFHDKcF4MFgBAz2WtXGmhYzNNrjaGSr+do="; + }) + ]; setupHook = ./setup-hook.sh; postFixup = ''