From ca1af4608807cf3fb74cbdf06e7e749ebc50019b Mon Sep 17 00:00:00 2001 From: Hans Christian Schmitz Date: Thu, 16 Oct 2025 19:42:26 +0200 Subject: [PATCH] fna3d: 25.02 -> 25.10 Upgrade FNA3D to version 25.10. 25.05 fixes CMake 4.0 compatibility. 25.03 builds against SDL3 by default. As I'm uncertain of whether this is a non-breaking change, I've opted to default to building against SDL2 still for nixpkgs (at least for now to get the CMake 4.0 incompatibility fixed). Other changes seem to be non-breaking. Diff: https://github.com/FNA-XNA/FNA3D/compare/25.02...25.10 Changelog: https://github.com/FNA-XNA/FNA3D/releases --- pkgs/by-name/fn/fna3d/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix index b2b5330515b6..220ce5488390 100644 --- a/pkgs/by-name/fn/fna3d/package.nix +++ b/pkgs/by-name/fn/fna3d/package.nix @@ -4,20 +4,26 @@ fetchFromGitHub, cmake, SDL2, + sdl3, + useSDL3 ? false, }: + stdenv.mkDerivation rec { pname = "fna3d"; - version = "25.02"; + version = "25.10"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FNA3D"; tag = version; fetchSubmodules = true; - hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs="; + hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw="; }; - buildInputs = [ SDL2 ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SDL3" useSDL3) + ]; + buildInputs = if useSDL3 then [ sdl3 ] else [ SDL2 ]; nativeBuildInputs = [ cmake ]; installPhase = ''