godot_4_5: init at 4.5-stable
https://godotengine.org/releases/4.5/ Co-authored-by: David McFarland <corngood@gmail.com>
This commit is contained in:
co-authored by
David McFarland
parent
e762586fba
commit
966d5ad75a
@@ -0,0 +1,11 @@
|
||||
{
|
||||
version = "4.5-stable";
|
||||
hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8=";
|
||||
default = {
|
||||
exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM=";
|
||||
};
|
||||
mono = {
|
||||
exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs=";
|
||||
nugetDeps = ./deps.json;
|
||||
};
|
||||
}
|
||||
+1317
File diff suppressed because it is too large
Load Diff
@@ -375,16 +375,18 @@ 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
|
||||
];
|
||||
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;
|
||||
|
||||
postPatch = ''
|
||||
# this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
|
||||
|
||||
@@ -59,6 +59,7 @@ rec {
|
||||
|
||||
godotPackages_4_3 = mkGodotPackages "4.3";
|
||||
godotPackages_4_4 = mkGodotPackages "4.4";
|
||||
godotPackages_4_5 = mkGodotPackages "4.5";
|
||||
godotPackages_4 = godotPackages_4_4;
|
||||
godotPackages = godotPackages_4;
|
||||
|
||||
@@ -68,6 +69,9 @@ rec {
|
||||
godot_4_4 = godotPackages_4_4.godot;
|
||||
godot_4_4-mono = godotPackages_4_4.godot-mono;
|
||||
godot_4_4-export-templates-bin = godotPackages_4_4.export-templates-bin;
|
||||
godot_4_5 = godotPackages_4_5.godot;
|
||||
godot_4_5-mono = godotPackages_4_5.godot-mono;
|
||||
godot_4_5-export-templates-bin = godotPackages_4_5.export-templates-bin;
|
||||
godot_4 = godotPackages_4.godot;
|
||||
godot_4-mono = godotPackages_4.godot-mono;
|
||||
godot_4-export-templates-bin = godotPackages_4.export-templates-bin;
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
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"])
|
||||
|
||||
@@ -2981,6 +2981,7 @@ with pkgs;
|
||||
godot3-mono-server
|
||||
godotPackages_4_3
|
||||
godotPackages_4_4
|
||||
godotPackages_4_5
|
||||
godotPackages_4
|
||||
godotPackages
|
||||
godot_4_3
|
||||
@@ -2989,6 +2990,9 @@ with pkgs;
|
||||
godot_4_4
|
||||
godot_4_4-mono
|
||||
godot_4_4-export-templates-bin
|
||||
godot_4_5
|
||||
godot_4_5-mono
|
||||
godot_4_5-export-templates-bin
|
||||
godot_4
|
||||
godot_4-mono
|
||||
godot_4-export-templates-bin
|
||||
|
||||
Reference in New Issue
Block a user