nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport godot: 4.5-stable -> 4.5.1-stable to release 25.05 (#452569)

Browse Source
This commit is contained in:
David McFarland
2025-10-16 14:41:27 +00:00
committed by GitHub
parent b3b07e2543 23b412a172
commit b7902c4646
4 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/godot/4.5/default.nix
View File

@@ -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;
};
}

22
pkgs/development/tools/godot/common.nix
View File

@@ -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

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

@@ -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"])

2
pkgs/development/tools/godot/update.sh
View File

@@ -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"