1 files changed, 36 insertions, 6 deletions

diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 91369b208fc9..b362bb1861e1 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "pysdl2";
-  version = "0.9.17";
+  version = "0.9.17-unstable-2025-04-03";
   pyproject = true;
 
   pythonImportsCheck = [ "sdl2" ];
@@ -29,23 +29,29 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "py-sdl";
     repo = "py-sdl2";
-    tag = version;
-    hash = "sha256-FqVgDGpImLN2a51TnU6eKjLK3rwW3ujdzOkK58ERBbE=";
+    rev = "6414ee1c5f4a6eb91b71f5f9e35d469eee395b9f";
+    hash = "sha256-E6Jpuin4bqDkvFTaZTsTNkNQJd2e5fuTf2oLsQ71uQ0=";
   };
 
   patches = [
     (replaceVars ./PySDL2-dll.patch (
-      builtins.mapAttrs
+      (builtins.mapAttrs
         (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}")
         {
           inherit
-            SDL2
             SDL2_ttf
             SDL2_image
             SDL2_gfx
             SDL2_mixer
             ;
         }
+      )
+      // {
+        # sdl2-compat has the pname sdl2-compat,
+        # but the shared object is named libSDL2.so for compatibility reasons.
+        # This requires making the shared object path for SDL2 not depend on pname.
+        SDL2 = (pkg: "${pkg}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}") SDL2;
+      }
     ))
   ];
 
@@ -75,10 +81,34 @@ buildPythonPackage rec {
   disabledTests = [
     # GetPrefPath for OrgName/AppName is None
     "test_SDL_GetPrefPath"
+
+    # broken with sdl2-compat
+    "test_SDL_AddDelHintCallback"
+    "test_SDL_HasIntersectionF"
+    "test_SDL_IntersectFRect"
+    "test_SDL_UnionFRect"
+    "test_SDL_EncloseFPoints"
+    "test_SDL_IntersectFRectAndLine"
+    "test_SDL_GetSetTextureScaleMode"
+    "test_init"
+    "test_logical_size"
+    "test_copy"
+
+    # sdl2-compat fails on these in our build sandbox
+    "test_create_sprite"
+    "test_create_software_sprite"
+    "test_create_texture_sprite"
+    "test_from_image"
+    "test_from_surface"
+    "test_from_text"
+
+    "test_SDL_Init"
+    "test_SDL_InitSubSystem"
+    "test_SDL_SetWindowIcon"
   ];
 
   meta = {
-    changelog = "https://github.com/py-sdl/py-sdl2/releases/tag/${src.tag}";
+    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${src.rev}";
     description = "Wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
     homepage = "https://github.com/py-sdl/py-sdl2";
     license = lib.licenses.publicDomain;