From e206e510e9bc8914a2b1192aa622b0fd0bf90880 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:41:39 +0100 Subject: [PATCH] gzdoom: 4.14.0 -> 4.14.1 --- pkgs/by-name/gz/gzdoom/package.nix | 6 ++---- pkgs/by-name/gz/gzdoom/string_format.patch | 13 ------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/by-name/gz/gzdoom/string_format.patch diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 0a71bda14202..f4fd2bc7d95a 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -25,18 +25,16 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-+gLWt1qBKl8xGK6sALnjqPuXcBexjWKbEkbRMFtLcbE="; + hash = "sha256-Hrqi2xpyMGcTJ2rI59EpcEtoJ+gCGmwEy+F396M3f/4="; }; - patches = [ ./string_format.patch ]; - outputs = [ "out" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "doc" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/gz/gzdoom/string_format.patch b/pkgs/by-name/gz/gzdoom/string_format.patch deleted file mode 100644 index 8aa655c7acaa..000000000000 --- a/pkgs/by-name/gz/gzdoom/string_format.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/common/engine/i_net.cpp b/src/common/engine/i_net.cpp -index ad106bbc4..0a67062a0 100644 ---- a/src/common/engine/i_net.cpp -+++ b/src/common/engine/i_net.cpp -@@ -1072,7 +1072,7 @@ void I_NetError(const char* error) - { - doomcom.numnodes = 0; - StartWindow->NetClose(); -- I_FatalError(error); -+ I_FatalError("%s", error); - } - - // todo: later these must be dispatched by the main menu, not the start screen.