From 2884dea84b5777584b99d9a61b73502b96b27b0d Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 28 Feb 2025 16:41:03 +0100
Subject: [PATCH 1/2] godot3: format with nixfmt

---
 pkgs/development/tools/godot/3/default.nix | 82 +++++++++++++---------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index c69fcfa57b46..e32088bf34ad 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -1,28 +1,29 @@
-{ lib
-, stdenv
-, alsa-lib
-, alsa-plugins
-, autoPatchelfHook
-, fetchFromGitHub
-, freetype
-, installShellFiles
-, libGLU
-, libpulseaudio
-, libX11
-, libXcursor
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrandr
-, libXrender
-, makeWrapper
-, openssl
-, pkg-config
-, scons
-, udev
-, yasm
-, zlib
+{
+  lib,
+  stdenv,
+  alsa-lib,
+  alsa-plugins,
+  autoPatchelfHook,
+  fetchFromGitHub,
+  freetype,
+  installShellFiles,
+  libGLU,
+  libpulseaudio,
+  libX11,
+  libXcursor,
+  libXext,
+  libXfixes,
+  libXi,
+  libXinerama,
+  libXrandr,
+  libXrender,
+  makeWrapper,
+  openssl,
+  pkg-config,
+  scons,
+  udev,
+  yasm,
+  zlib,
 }:
 
 stdenv.mkDerivation (self: {
@@ -100,9 +101,13 @@ stdenv.mkDerivation (self: {
   shouldInstallHeaders = self.shouldBuildTools;
   shouldInstallShortcut = self.shouldBuildTools && self.godotBuildPlatform != "server";
 
-  outputs = ["out"] ++ lib.optional self.shouldInstallManual "man" ++ lib.optional self.shouldBuildTools "dev";
+  outputs =
+    [ "out" ]
+    ++ lib.optional self.shouldInstallManual "man"
+    ++ lib.optional self.shouldBuildTools "dev";
 
-  builtGodotBinNamePattern = if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*";
+  builtGodotBinNamePattern =
+    if self.godotBuildPlatform == "server" then "godot_server.*" else "godot.*";
 
   godotBinInstallPath = "bin";
   installedGodotBinName = self.pname;
@@ -150,17 +155,26 @@ stdenv.mkDerivation (self: {
     runHook postInstall
   '';
 
-  runtimeDependencies = lib.optionals self.shouldPatchBinary (map lib.getLib [
-    alsa-lib
-    libpulseaudio
-    udev
-  ]);
+  runtimeDependencies = lib.optionals self.shouldPatchBinary (
+    map lib.getLib [
+      alsa-lib
+      libpulseaudio
+      udev
+    ]
+  );
 
   meta = with lib; {
     homepage = "https://godotengine.org";
     description = "Free and Open Source 2D and 3D game engine (" + self.godotBuildDescription + ")";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ rotaerk twey ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with maintainers; [
+      rotaerk
+      twey
+    ];
   };
 })

From 6159c28f79e406ccf5b5c1e3befe2ad008680b40 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 28 Feb 2025 16:48:24 +0100
Subject: [PATCH 2/2] godot3: 3.5.2 -> 3.6

---
 pkgs/development/tools/godot/3/default.nix                | 8 ++++----
 ...eVersion_3.5.2.patch => hardcodeGlueVersion_3.6.patch} | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/{hardcodeGlueVersion_3.5.2.patch => hardcodeGlueVersion_3.6.patch} (97%)

diff --git a/pkgs/development/tools/godot/3/default.nix b/pkgs/development/tools/godot/3/default.nix
index e32088bf34ad..c44fb7c9033c 100644
--- a/pkgs/development/tools/godot/3/default.nix
+++ b/pkgs/development/tools/godot/3/default.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation (self: {
   pname = "godot3";
-  version = "3.5.2";
+  version = "3.6";
   godotBuildDescription = "X11 tools";
 
   src = fetchFromGitHub {
     owner = "godotengine";
     repo = "godot";
     rev = "${self.version}-stable";
-    sha256 = "sha256-C+1J5N0ETL1qKust+2xP9uB4x9NwrMqIm8aFAivVYQw=";
+    sha256 = "sha256-4WQYO1BBDK9+eyblpI8qRgbBG4+qPRVZMjeAFAtot+0=";
   };
 
   nativeBuildInputs = [
@@ -84,7 +84,7 @@ stdenv.mkDerivation (self: {
   shouldBuildTools = true;
   godotBuildTarget = "release_debug";
 
-  shouldUseLinkTimeOptimization = self.godotBuildTarget == "release";
+  lto = if self.godotBuildTarget == "release" then "full" else "none";
 
   sconsFlags = [
     "arch=${stdenv.hostPlatform.linuxArch}"
@@ -92,7 +92,7 @@ stdenv.mkDerivation (self: {
     "tools=${lib.boolToString self.shouldBuildTools}"
     "target=${self.godotBuildTarget}"
     "bits=${toString stdenv.hostPlatform.parsed.cpu.bits}"
-    "use_lto=${lib.boolToString self.shouldUseLinkTimeOptimization}"
+    "lto=${self.lto}"
   ];
 
   shouldWrapBinary = self.shouldBuildTools;
diff --git a/pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.5.2.patch b/pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.6.patch
similarity index 97%
rename from pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.5.2.patch
rename to pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.6.patch
index d8a3460126d0..02adebb37147 100644
--- a/pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.5.2.patch
+++ b/pkgs/development/tools/godot/3/mono/patches/gen_cs_glue_version.py/hardcodeGlueVersion_3.6.patch
@@ -16,7 +16,7 @@ index 98bbb4d9be..5189f2551b 100644
 -            latest_mtime = mtime if mtime > latest_mtime else latest_mtime
 -
 -    glue_version = int(latest_mtime)  # The latest modified time will do for now
-+    glue_version = 1678112021
++    glue_version = 1725828088
  
      with open(version_header_dst, "w") as version_header:
          version_header.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")