From 786f07652f0333d1b4df3784ee5046198c264d76 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 15 Oct 2025 14:17:54 -0300
Subject: [PATCH 1/2] godot/update.sh: redirect fetch output to stderr

(cherry picked from commit f95dfedb98b7879f259b24096e02d7f72c57e9c3)
---
 pkgs/development/tools/godot/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/godot/update.sh b/pkgs/development/tools/godot/update.sh
index 1cf654b70d87..ac2606c39c12 100755
--- a/pkgs/development/tools/godot/update.sh
+++ b/pkgs/development/tools/godot/update.sh
@@ -14,7 +14,7 @@ nix-update "$attr".godot \
 [[ $(nix eval --raw -f. "$attr".godot) != "$prev_version" ]] || exit 0
 
 fetch_deps=$(nix build -f. "$attr".godot-mono.fetch-deps --print-out-paths --no-link)
-"$fetch_deps"
+"$fetch_deps" >&2
 
 update-source-version "$attr".godot.export-templates-bin --ignore-same-version --file="$file"
 update-source-version "$attr".godot-mono.export-templates-bin --ignore-same-version --file="$file"

From 23b412a17249c6280864f26e2951a611307e5781 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 15 Oct 2025 17:24:05 +0000
Subject: [PATCH 2/2] godot: 4.5-stable -> 4.5.1-stable

(cherry picked from commit b306c675381fb696ab30be19aa88de3c9a4003dd)
---
 pkgs/development/tools/godot/4.5/default.nix  |  8 +++----
 pkgs/development/tools/godot/common.nix       | 22 +++++++++----------
 .../tools/godot/fix-freetype-link-error.patch | 16 --------------
 3 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/tools/godot/fix-freetype-link-error.patch

diff --git a/pkgs/development/tools/godot/4.5/default.nix b/pkgs/development/tools/godot/4.5/default.nix
index 0db38e4de8b3..ef4e38e5d920 100644
--- a/pkgs/development/tools/godot/4.5/default.nix
+++ b/pkgs/development/tools/godot/4.5/default.nix
@@ -1,11 +1,11 @@
 {
-  version = "4.5-stable";
-  hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8=";
+  version = "4.5.1-stable";
+  hash = "sha256-8iMhn40y7aVL6Xjvo34ZtfygJYWwDmCnTxUJcV3AQCI=";
   default = {
-    exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM=";
+    exportTemplatesHash = "sha256-GZivN/E4doTiwhHNtIPa9JL8ZNxrEglr3c3KJbaRDIY=";
   };
   mono = {
-    exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs=";
+    exportTemplatesHash = "sha256-xCVjMGG7SfQ5C9zs4rnOaLOwvjxxCVtAZE2PbxexFG4=";
     nugetDeps = ./deps.json;
   };
 }
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index c8ba44274a13..07d996bd9143 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -173,18 +173,16 @@ let
 
       strictDeps = true;
 
-      patches =
-        lib.optionals (lib.versionOlder version "4.4") [
-          (fetchpatch {
-            name = "wayland-header-fix.patch";
-            url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
-            hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
-          })
-          # Fix a crash in the mono test project build. It no longer seems to
-          # happen in 4.4, but an existing fix couldn't be identified.
-          ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
-        ]
-        ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch;
+      patches = lib.optionals (lib.versionOlder version "4.4") [
+        (fetchpatch {
+          name = "wayland-header-fix.patch";
+          url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
+          hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
+        })
+        # Fix a crash in the mono test project build. It no longer seems to
+        # happen in 4.4, but an existing fix couldn't be identified.
+        ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
+      ];
 
       postPatch = ''
         # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
diff --git a/pkgs/development/tools/godot/fix-freetype-link-error.patch b/pkgs/development/tools/godot/fix-freetype-link-error.patch
deleted file mode 100644
index 6ae73c6aa68b..000000000000
--- a/pkgs/development/tools/godot/fix-freetype-link-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
-index 0a52ef46c5..c932900037 100644
---- a/modules/freetype/SCsub
-+++ b/modules/freetype/SCsub
-@@ -62,9 +62,9 @@ if env["builtin_freetype"]:
-     if env["brotli"]:
-         env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
- 
--    env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
-+    env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"])
-     # Also needed in main env for scene/
--    env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
-+    env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
- 
-     env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"])
- 
\ No newline at end of file