Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

python3Packages.pygame{,-ce}: unbreak on darwin (#401206)

authored by Gaétan Lepage and committed by GitHub 8a1bb03b 424ebea5

Changed files
+59 -31
pkgs
by-name
sd
SDL2_classic_image
SDL2_classic_mixer
SDL2_classic_mixer_2_0
SDL2_classic_ttf
SDL2_image
development
python-modules
pygame
pygame-ce
top-level
+13
pkgs/by-name/sd/SDL2_classic_image/package.nix
··· 1 + { 2 + SDL2_image, 3 + SDL2_classic, 4 + enableSTB ? true, 5 + }: 6 + 7 + (SDL2_image.override { 8 + SDL2 = SDL2_classic; 9 + inherit enableSTB; 10 + }).overrideAttrs 11 + { 12 + pname = "SDL2_classic_image"; 13 + }
+11
pkgs/by-name/sd/SDL2_classic_mixer/package.nix
··· 1 + { 2 + SDL2_mixer, 3 + SDL2_classic, 4 + }: 5 + 6 + (SDL2_mixer.override { 7 + SDL2 = SDL2_classic; 8 + }).overrideAttrs 9 + { 10 + pname = "SDL2_classic_mixer"; 11 + }
+8
pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix
··· 1 + { 2 + SDL2_mixer_2_0, 3 + SDL2_classic_mixer, 4 + }: 5 + 6 + SDL2_mixer_2_0.override { 7 + SDL2_mixer = SDL2_classic_mixer; 8 + }
+11
pkgs/by-name/sd/SDL2_classic_ttf/package.nix
··· 1 + { 2 + SDL2_ttf, 3 + SDL2_classic, 4 + }: 5 + 6 + (SDL2_ttf.override { 7 + SDL2 = SDL2_classic; 8 + }).overrideAttrs 9 + { 10 + pname = "SDL2_classic_ttf"; 11 + }
-6
pkgs/by-name/sd/SDL2_image/package.nix
··· 2 2 lib, 3 3 SDL2, 4 4 autoreconfHook, 5 - darwin, 6 5 fetchurl, 7 - giflib, 8 - libXpm, 9 6 libjpeg, 10 7 libpng, 11 8 libtiff, ··· 19 16 enableSdltest ? (!stdenv.hostPlatform.isDarwin), 20 17 }: 21 18 22 - let 23 - inherit (darwin.apple_sdk.frameworks) Foundation; 24 - in 25 19 stdenv.mkDerivation (finalAttrs: { 26 20 pname = "SDL2_image"; 27 21 version = "2.8.5";
+8 -13
pkgs/development/python-modules/pygame-ce/default.nix
··· 20 20 libX11, 21 21 portmidi, 22 22 SDL2_classic, 23 - SDL2_image, 24 - SDL2_mixer, 25 - SDL2_ttf, 23 + SDL2_classic_image, 24 + SDL2_classic_mixer_2_0, 25 + SDL2_classic_ttf, 26 26 numpy, 27 27 28 28 pygame-gui, ··· 100 100 libpng 101 101 portmidi 102 102 SDL2_classic 103 - (SDL2_image.override { enableSTB = false; }) 104 - SDL2_mixer 105 - SDL2_ttf 103 + (SDL2_classic_image.override { enableSTB = false; }) 104 + SDL2_classic_mixer_2_0 105 + SDL2_classic_ttf 106 106 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; 107 107 108 108 nativeCheckInputs = [ ··· 126 126 # No audio or video device in test environment 127 127 export SDL_VIDEODRIVER=dummy 128 128 export SDL_AUDIODRIVER=disk 129 + # traceback for segfaults 130 + export PYTHONFAULTHANDLER=1 129 131 ''; 130 132 131 133 checkPhase = '' ··· 162 164 license = lib.licenses.lgpl21Plus; 163 165 maintainers = [ lib.maintainers.pbsds ]; 164 166 platforms = lib.platforms.unix; 165 - badPlatforms = [ 166 - # loading pygame.tests.font_test 167 - # /nix/store/mrvg4qq09d51w5s95v15y4ym05q009fd-stdenv-darwin/setup: line 1771: 64131 Segmentation fault: 11 168 - # 169 - # https://github.com/NixOS/nixpkgs/issues/400378 170 - lib.systems.inspect.patterns.isDarwin 171 - ]; 172 167 }; 173 168 }
+8 -11
pkgs/development/python-modules/pygame/default.nix
··· 21 21 libpng, 22 22 libX11, 23 23 portmidi, 24 - SDL2_image, 25 - SDL2_mixer, 26 - SDL2_ttf, 24 + SDL2_classic_image, 25 + SDL2_classic_mixer, 26 + SDL2_classic_ttf, 27 27 }: 28 28 29 29 buildPythonPackage rec { ··· 87 87 libX11 88 88 portmidi 89 89 SDL2_classic 90 - (SDL2_image.override { enableSTB = false; }) 91 - SDL2_mixer 92 - SDL2_ttf 90 + (SDL2_classic_image.override { enableSTB = false; }) 91 + SDL2_classic_mixer 92 + SDL2_classic_ttf 93 93 ]; 94 94 95 95 preConfigure = '' ··· 106 106 # No audio or video device in test environment 107 107 export SDL_VIDEODRIVER=dummy 108 108 export SDL_AUDIODRIVER=disk 109 + # traceback for segfaults 110 + export PYTHONFAULTHANDLER=1 109 111 110 112 ${python.interpreter} -m pygame.tests -v \ 111 113 --exclude opengl,timing \ ··· 122 124 license = lib.licenses.lgpl21Plus; 123 125 maintainers = with lib.maintainers; [ emilytrau ]; 124 126 platforms = lib.platforms.unix; 125 - badPlatforms = [ 126 - # Several tests segfault 127 - # https://github.com/pygame/pygame/issues/4486 128 - lib.systems.inspect.patterns.isDarwin 129 - ]; 130 127 }; 131 128 }
-1
pkgs/top-level/python-packages.nix
··· 12306 12306 12307 12307 pygame-ce = callPackage ../development/python-modules/pygame-ce { 12308 12308 inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; 12309 - SDL2_mixer = pkgs.SDL2_mixer_2_0; 12310 12309 }; 12311 12310 12312 12311 pygame-gui = callPackage ../development/python-modules/pygame-gui { };