Unverified Commit e98c99a4 authored by Marcin Serwin's avatar Marcin Serwin
Browse files

pygame-ce: unbreak

parent 45148346

pkgs/development/python-modules/pygame-ce/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
  libpng,

  libX11,

  portmidi,

  SDL2,

  SDL2_classic,

  SDL2_image,

  SDL2_mixer,

  SDL2_ttf,
@@ -60,8 +60,6 @@ buildPythonPackage rec { 
        ]) buildInputs

      );

    })

    # Skip tests that should be disabled without video driver

    ./skip-surface-tests.patch

  ];



  postPatch =
@@ -101,7 +99,7 @@ buildPythonPackage rec { 
    libjpeg

    libpng

    portmidi

    SDL2

    SDL2_classic

    SDL2_image

    SDL2_mixer

    SDL2_ttf
@@ -117,7 +115,7 @@ buildPythonPackage rec { 


  env =

    {

      SDL_CONFIG = lib.getExe' (lib.getDev SDL2) "sdl2-config";

      SDL_CONFIG = lib.getExe' (lib.getDev SDL2_classic) "sdl2-config";

    }

    // lib.optionalAttrs stdenv.cc.isClang {

      NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";

pkgs/development/python-modules/pygame-ce/skip-surface-tests.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
diff --git a/test/surface_test.py b/test/surface_test.py

index 5ce78b6e..8b8f7ed5 100644

--- a/test/surface_test.py

+++ b/test/surface_test.py

@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase):

         finally:

             pygame.display.quit()

 

+    @unittest.skipIf(

+        os.environ.get("SDL_VIDEODRIVER") == "dummy",

+        'requires a non-"dummy" SDL_VIDEODRIVER',

+    )

     def test_convert_init(self):

         """Ensure initialization exceptions are raised

         for surf.convert()."""

@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase):

         finally:

             pygame.display.quit()

 

+    @unittest.skipIf(

+        os.environ.get("SDL_VIDEODRIVER") == "dummy",

+        'requires a non-"dummy" SDL_VIDEODRIVER',

+    )

     def test_convert_alpha_init(self):

         """Ensure initialization exceptions are raised

         for surf.convert_alpha()."""