From a3524c32f76b906d3d0089ecd3bca5cd420c6af8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:05:13 +0200 Subject: [PATCH 1/9] SDL2_classic_image: init at 2.8.5 --- pkgs/by-name/sd/SDL2_classic_image/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/by-name/sd/SDL2_classic_image/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_image/package.nix b/pkgs/by-name/sd/SDL2_classic_image/package.nix new file mode 100644 index 000000000000..6a6f58fc573a --- /dev/null +++ b/pkgs/by-name/sd/SDL2_classic_image/package.nix @@ -0,0 +1,13 @@ +{ + SDL2_image, + SDL2_classic, + enableSTB ? true, +}: + +(SDL2_image.override { + SDL2 = SDL2_classic; + inherit enableSTB; +}).overrideAttrs + { + pname = "SDL2_classic_image"; + } From 1c96fce7c67e0ca2d34c2cd755931b88813de2cf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:05:41 +0200 Subject: [PATCH 2/9] SDL2_classic_ttf: init at 2.24.0 --- pkgs/by-name/sd/SDL2_classic_ttf/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/by-name/sd/SDL2_classic_ttf/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_ttf/package.nix b/pkgs/by-name/sd/SDL2_classic_ttf/package.nix new file mode 100644 index 000000000000..9190cfc7953e --- /dev/null +++ b/pkgs/by-name/sd/SDL2_classic_ttf/package.nix @@ -0,0 +1,11 @@ +{ + SDL2_ttf, + SDL2_classic, +}: + +(SDL2_ttf.override { + SDL2 = SDL2_classic; +}).overrideAttrs + { + pname = "SDL2_classic_ttf"; + } From bade2d05aa32540bd303c43e8749f247636cf2a2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:06:20 +0200 Subject: [PATCH 3/9] SDL2_classic_mixer: init at 2.8.1 --- pkgs/by-name/sd/SDL2_classic_mixer/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/by-name/sd/SDL2_classic_mixer/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_mixer/package.nix b/pkgs/by-name/sd/SDL2_classic_mixer/package.nix new file mode 100644 index 000000000000..4aaf22b7cd6e --- /dev/null +++ b/pkgs/by-name/sd/SDL2_classic_mixer/package.nix @@ -0,0 +1,11 @@ +{ + SDL2_mixer, + SDL2_classic, +}: + +(SDL2_mixer.override { + SDL2 = SDL2_classic; +}).overrideAttrs + { + pname = "SDL2_classic_mixer"; + } From a6cbffdc00fed3ca8663da3f127ab9864127810b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:06:46 +0200 Subject: [PATCH 4/9] SDL2_classic_mixer_2_0: init at 2.0.4 --- pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix diff --git a/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix new file mode 100644 index 000000000000..ba06648eebf6 --- /dev/null +++ b/pkgs/by-name/sd/SDL2_classic_mixer_2_0/package.nix @@ -0,0 +1,8 @@ +{ + SDL2_mixer_2_0, + SDL2_classic_mixer, +}: + +SDL2_mixer_2_0.override { + SDL2_mixer = SDL2_classic_mixer; +} From 4473849d6ddba2c06b81b228b3352c4b2ad79935 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:07:31 +0200 Subject: [PATCH 5/9] SDL2_image: remove unused inputs --- pkgs/by-name/sd/SDL2_image/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 6baa7311a5c2..486b8ef3695c 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -2,10 +2,7 @@ lib, SDL2, autoreconfHook, - darwin, fetchurl, - giflib, - libXpm, libjpeg, libpng, libtiff, @@ -19,9 +16,6 @@ enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; version = "2.8.5"; From 66ebd9e90e5982f1e09572d96577b8b1101749a8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:08:29 +0200 Subject: [PATCH 6/9] python3Packages.pygame-ce: unbreak on darwin --- .../python-modules/pygame-ce/default.nix | 19 ++++++------------- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 7ae71a8be1a3..42f07738f2ac 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -20,9 +20,9 @@ libX11, portmidi, SDL2_classic, - SDL2_image, - SDL2_mixer, - SDL2_ttf, + SDL2_classic_image, + SDL2_classic_mixer_2_0, + SDL2_classic_ttf, numpy, pygame-gui, @@ -100,9 +100,9 @@ buildPythonPackage rec { libpng portmidi SDL2_classic - (SDL2_image.override { enableSTB = false; }) - SDL2_mixer - SDL2_ttf + (SDL2_classic_image.override { enableSTB = false; }) + SDL2_classic_mixer_2_0 + SDL2_classic_ttf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; nativeCheckInputs = [ @@ -162,12 +162,5 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.unix; - badPlatforms = [ - # loading pygame.tests.font_test - # /nix/store/mrvg4qq09d51w5s95v15y4ym05q009fd-stdenv-darwin/setup: line 1771: 64131 Segmentation fault: 11 - # - # https://github.com/NixOS/nixpkgs/issues/400378 - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b158c2b21768..2567f89dddf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12292,7 +12292,6 @@ self: super: with self; { pygame-ce = callPackage ../development/python-modules/pygame-ce { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; - SDL2_mixer = pkgs.SDL2_mixer_2_0; }; pygame-gui = callPackage ../development/python-modules/pygame-gui { }; From 92088125836864c98214a4440c9e934edcbb1113 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:10:32 +0200 Subject: [PATCH 7/9] python3Packages.pygame: unbreak on darwin --- .../python-modules/pygame/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index bb595909e5c9..a4bbbe9ce13a 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -21,9 +21,9 @@ libpng, libX11, portmidi, - SDL2_image, - SDL2_mixer, - SDL2_ttf, + SDL2_classic_image, + SDL2_classic_mixer, + SDL2_classic_ttf, }: buildPythonPackage rec { @@ -87,9 +87,9 @@ buildPythonPackage rec { libX11 portmidi SDL2_classic - (SDL2_image.override { enableSTB = false; }) - SDL2_mixer - SDL2_ttf + (SDL2_classic_image.override { enableSTB = false; }) + SDL2_classic_mixer + SDL2_classic_ttf ]; preConfigure = '' @@ -122,10 +122,5 @@ buildPythonPackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.unix; - badPlatforms = [ - # Several tests segfault - # https://github.com/pygame/pygame/issues/4486 - lib.systems.inspect.patterns.isDarwin - ]; }; } From d777e89883d55e0818f95ce4dfc27e127a4c9e51 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:13:04 +0200 Subject: [PATCH 8/9] python3Packages.pygame-ce: add traceback for segfaults in checkPhase --- pkgs/development/python-modules/pygame-ce/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 42f07738f2ac..7cd1dcc35025 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -126,6 +126,8 @@ buildPythonPackage rec { # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk + # traceback for segfaults + export PYTHONFAULTHANDLER=1 ''; checkPhase = '' From 6fd448e108c3a59a33dbcff7d403a7eb56ef225a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 23 Apr 2025 21:14:21 +0200 Subject: [PATCH 9/9] python3Packages.pygame: add traceback for segfaults in checkPhase --- pkgs/development/python-modules/pygame/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a4bbbe9ce13a..ef53e32126bc 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -106,6 +106,8 @@ buildPythonPackage rec { # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk + # traceback for segfaults + export PYTHONFAULTHANDLER=1 ${python.interpreter} -m pygame.tests -v \ --exclude opengl,timing \