From c65ad2c49fc3c558823e753237da5c452cf1fbb0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 Oct 2023 11:15:58 +0100 Subject: [PATCH] gzdoom: 4.10.0 -> 4.11.0 Among other things fixes build failure against gcc-13: $ nix build --impure --expr 'with import ./. {}; gzdoom.override { stdenv = gcc13Stdenv; }' -L gzdoom> /build/source/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h: In function 'void VmaUint32ToStr(char*, size_t, uint32_t)': gzdoom> /build/source/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h:2410:9: error: 'snprintf' was not declared in this scope gzdoom> 2410 | snprintf(outStr, strLen, "%u", static_cast(num)); gzdoom> | ^~~~~~~~ gzdoom> /build/source/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h:2262:1: note: 'snprintf' is defined in header ''; did you forget to '#include '? Changes: https://github.com/ZDoom/gzdoom/releases/tag/g4.11.0 --- pkgs/games/doom-ports/gzdoom/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index aaa800269a75..cd8d5d933d5a 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -14,6 +14,7 @@ , libjpeg , libsndfile , libvpx +, libwebp , mpg123 , ninja , openal @@ -25,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.10.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; + hash = "sha256-F3FXV76jpwkOE6QoNi1+TjLOt9x7q3pcZq3hQmRfL5E="; }; outputs = [ "out" "doc" ]; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { libjpeg libsndfile libvpx + libwebp mpg123 openal vulkan-loader