From b51c9c4624f7eea7757194f15ac7ad9256420a99 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Thu, 1 Jan 2026 10:56:13 +0100 Subject: [PATCH 1/3] sdl3-image: 3.2.4 -> 3.2.6 --- pkgs/by-name/sd/sdl3-image/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index b09a3be81172..eb318ef2fdd1 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3-image"; - version = "3.2.4"; + version = "3.2.6"; outputs = [ "lib" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL_image"; tag = "release-${finalAttrs.version}"; - hash = "sha256-/orQ+YfH0CV8DOqXFMF9fOT4YaVpC1t55xM3j520Png="; + hash = "sha256-CnUCqFq9ZaM/WQcmaCpQdjtjR9l5ymzgeqEJx7ZW/s4="; }; strictDeps = true; From 014f8bf1d4cddd216629f97c6639771bf9ac7ad7 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Thu, 1 Jan 2026 14:01:19 +0100 Subject: [PATCH 2/3] sdl3-image: enable jxl --- pkgs/by-name/sd/sdl3-image/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index eb318ef2fdd1..a4f2ca869fcd 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -10,6 +10,7 @@ validatePkgConfig, libpng, libjpeg, + libjxl, nix-update-script, # Boolean flags enableTests ? true, @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp libavif + libjxl ] ++ (lib.optionals (!enableSTB) [ libpng @@ -64,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) # enable tests (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) + # enable jxl + (lib.cmakeBool "SDLIMAGE_JXL" true) ]; passthru.updateScript = nix-update-script { From 74cb5fc92e994eeefa805e736cf78e9c7521d084 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Thu, 1 Jan 2026 14:09:58 +0100 Subject: [PATCH 3/3] sdl3-image: disable avif on darwin --- pkgs/by-name/sd/sdl3-image/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index a4f2ca869fcd..c765a02c6b9f 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: { sdl3 libtiff libwebp - libavif libjxl ] + ++ (lib.optional (!stdenv.hostPlatform.isDarwin) libavif) ++ (lib.optionals (!enableSTB) [ libpng libjpeg @@ -68,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) # enable jxl (lib.cmakeBool "SDLIMAGE_JXL" true) + # disable avif on darwin (see https://github.com/NixOS/nixpkgs/issues/400910) + (lib.cmakeBool "SDLIMAGE_AVIF" (!stdenv.hostPlatform.isDarwin)) ]; passthru.updateScript = nix-update-script {