From e8e654d6325a931efa55f354168e9c596443bee2 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 22 Jan 2025 14:21:16 +0100 Subject: [PATCH 1/2] sdl3: 3.1.8 -> 3.2.0 --- pkgs/by-name/sd/sdl3/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index a160935701fb..feaf44783728 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.1.8"; + version = "3.2.0"; outputs = [ "lib" @@ -62,8 +62,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; - tag = "preview-${finalAttrs.version}"; - hash = "sha256-yfnW5y99EegifRavvZWmXPH2NFPKWoe90RmGDGk6PI4="; + tag = "release-${finalAttrs.version}"; + hash = "sha256-gVLZPuXtMdFhylxh3+LC/SJCaQiOwZpbVcBGctyGGYY="; }; postPatch = @@ -213,13 +213,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "'preview-(.*)'" + "'release-(.*)'" ]; }; }; meta = { - description = "Cross-platform development library (Preview version)"; + description = "Cross-platform development library"; homepage = "https://libsdl.org"; changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; From f5b54a08fee334820638418c610e72afedf5dac4 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 22 Jan 2025 21:07:49 +0100 Subject: [PATCH 2/2] sdl3: add vulkan-headers/loader to dlopenPropagatedBuildInputs --- pkgs/by-name/sd/sdl3/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index feaf44783728..9d61925873ad 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -28,6 +28,8 @@ systemdLibs, testers, validatePkgConfig, + vulkan-headers, + vulkan-loader, wayland, wayland-scanner, xorg, @@ -136,7 +138,11 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = finalAttrs.dlopenPropagatedBuildInputs; dlopenPropagatedBuildInputs = - lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL + [ + vulkan-headers + vulkan-loader + ] + ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL ++ lib.optional x11Support xorg.libX11; cmakeFlags = [