Unverified Commit 4376740e authored by David McFarland's avatar David McFarland Committed by GitHub
Browse files

godot: 4.5-stable -> 4.5.1-stable (#452328)

parents 2f8f39e1 b306c675

pkgs/development/tools/godot/4.5/default.nix

+4 −4
Original line number Diff line number Diff line 
{

  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;

  };

}

pkgs/development/tools/godot/common.nix

+1 −2
Original line number Diff line number Diff line
@@ -426,8 +426,7 @@ let 
          # 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;

        ];



        postPatch = ''

          # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE

pkgs/development/tools/godot/fix-freetype-link-error.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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

pkgs/development/tools/godot/update.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"