gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

godot_4_6: 4.6-stable -> 4.6.1-stable (#491826)

Browse Source
This commit is contained in:
David McFarland
2026-02-19 13:37:22 +00:00
committed by GitHub
parent 2d7dd84765 4d890d728b
commit f9ed77ec0e
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/godot/4.6/default.nix
+4 -4
View File
@@ -1,11 +1,11 @@
{
version = "4.6-stable";
hash = "sha256-lK9KQsmrNZLx7yP3PwbN93otwkWq2H+nWt85WH/u8oI=";
version = "4.6.1-stable";
hash = "sha256-C3AX+Gl6a3nX/k0TP6FYjYCK9AbKmtku+1ilYBu0R74=";
default = {
exportTemplatesHash = "sha256-OzCsjBdy8l9d+l9lkiyrCpDnuWAXaJEjfFdyUV68zEY=";
exportTemplatesHash = "sha256-5tNyr9T9+q6VceteNWivzZbObbmlaSRANBVPrwrGmHU=";
};
mono = {
exportTemplatesHash = "sha256-RgVug5TNHx+FzPqr3f/Bpn9ZW/2Z+9ps1ir6dR2/xRk=";
exportTemplatesHash = "sha256-V5JmHtCJVQNX4OEJVK9pWEa+CjLtdJT6QKAAnjtaPqk=";
nugetDeps = ./deps.json;
};
}
pkgs/development/tools/godot/common.nix
+30 -29
View File
@@ -461,35 +461,36 @@ let
(allow file-read* (subpath "/System/Library/CoreServices/SystemAppearance.bundle"))
'';
patches = [
./Linux-fix-missing-library-with-builtin_glslang-false.patch
]
++ lib.optionals (lib.versionAtLeast version "4.6") [
# https://github.com/godotengine/godot/pull/115450
(fetchpatch {
name = "fix-tls-handshake-fail-preventing-assetlib-use.patch";
url = "https://github.com/godotengine/godot/commit/29acd734c71f06268d6ef4715d7df70b14731f48.patch";
hash = "sha256-wxkr6jPtutUTG+mYrXoxcDcWIIZghlSJ79XqhFh/0P4=";
})
]
++ 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=";
})
(fetchpatch {
name = "thorvg-header-fix.patch";
url = "https://github.com/godotengine/godot/commit/1823460787a6c1bb8e4eaf21ac2a3f90d24d5ee0.patch";
hash = "sha256-PcHEMXd0v2c3j6Eitxt5uWi6cD+OmsBAn3TNMNRNPog=";
})
# 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 (
stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "4.4"
) ./fix-moltenvk-detection.patch;
patches =
lib.optionals (lib.versionOlder version "4.6") [
./Linux-fix-missing-library-with-builtin_glslang-false.patch
]
++ lib.optionals (lib.versionAtLeast version "4.6") [
# https://github.com/godotengine/godot/pull/115450
(fetchpatch {
name = "fix-tls-handshake-fail-preventing-assetlib-use.patch";
url = "https://github.com/godotengine/godot/commit/29acd734c71f06268d6ef4715d7df70b14731f48.patch";
hash = "sha256-wxkr6jPtutUTG+mYrXoxcDcWIIZghlSJ79XqhFh/0P4=";
})
]
++ 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=";
})
(fetchpatch {
name = "thorvg-header-fix.patch";
url = "https://github.com/godotengine/godot/commit/1823460787a6c1bb8e4eaf21ac2a3f90d24d5ee0.patch";
hash = "sha256-PcHEMXd0v2c3j6Eitxt5uWi6cD+OmsBAn3TNMNRNPog=";
})
# 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 (
stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "4.4"
) ./fix-moltenvk-detection.patch;
postPatch = ''
# this stops scons from hiding e.g. NIX_CFLAGS_COMPILE