From b3646e9cd998d02bf3bfedfdb787f56da0d31bb0 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:41:09 +0200
Subject: [PATCH] gzdoom: fixes

---
 pkgs/by-name/gz/gzdoom/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix
index b1fef391ba6f..2ab2b21009c3 100644
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@@ -68,9 +68,10 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace tools/updaterevision/UpdateRevision.cmake \
-      --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \
-      --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \
-      --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")"
+      --replace-fail "ret_var(Tag)" "ret_var(\"${src.rev}\")" \
+      --replace-fail "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \
+      --replace-fail "ret_var(Hash)" "ret_var(\"${src.rev}\")" \
+      --replace-fail "<unknown version>" "${src.rev}"
   '';
 
   cmakeFlags = [
@@ -96,8 +97,8 @@ stdenv.mkDerivation rec {
 
     for size in 16 24 32 48 64 128; do
       mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \
-        $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png
+      magick $src/src/win32/icon1.ico -background none -resize "$size"x"$size" -flatten \
+       $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png
     done;
   '';