godot_4: 4.0-beta14 -> 4.0-beta16

2 files changed, 14 insertions, 30 deletions

diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix
index abf87bd0ba19a..5732b8f44f620 100644
--- a/pkgs/development/tools/godot/4/default.nix
+++ b/pkgs/development/tools/godot/4/default.nix
@@ -1,11 +1,12 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, installShellFiles
-, autoPatchelfHook
 , pkg-config
+, autoPatchelfHook
+, installShellFiles
 , scons
 , vulkan-loader
+, libGL
 , libX11
 , libXcursor
 , libXinerama
@@ -14,7 +15,7 @@
 , libXrender
 , libXi
 , libXfixes
-, freetype
+, libxkbcommon
 , alsa-lib
 , libpulseaudio
 , dbus
@@ -24,9 +25,9 @@
 , withPlatform ? "linuxbsd"
 , withTarget ? "editor"
 , withPrecision ? "single"
-, withPulseaudio ? false
+, withPulseaudio ? true
 , withDbus ? true
-, withSpeechd ? false
+, withSpeechd ? true
 , withFontconfig ? true
 , withUdev ? true
 , withTouch ? true
@@ -42,7 +43,7 @@ let
     precision = withPrecision; # Floating-point precision level
 
     # Options from 'godot/platform/linuxbsd/detect.py'
-    pulseaudio = withPulseaudio;
+    pulseaudio = withPulseaudio; # Use PulseAudio
     dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
     speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
     fontconfig = withFontconfig; # Use fontconfig for system fonts support
@@ -52,13 +53,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "godot";
-  version = "4.0-beta14";
+  version = "4.0-beta16";
 
   src = fetchFromGitHub {
     owner = "godotengine";
     repo = "godot";
-    rev = "28a24639c3c6a95b5b9828f5f02bf0dc2f5ce54b";
-    sha256 = "sha256-qAotCc2YUg8FMK+JFHi5B4OL/cAtvWO/pYRRz8RcNUY=";
+    rev = "518b9e5801a19229805fe837d7d0cf92920ad413";
+    sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY=";
   };
 
   nativeBuildInputs = [
@@ -69,10 +70,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     scons
-  ]
-  ++ runtimeDependencies;
+  ];
 
   runtimeDependencies = [
+    vulkan-loader
+    libGL
     libX11
     libXcursor
     libXinerama
@@ -81,8 +83,8 @@ stdenv.mkDerivation rec {
     libXrender
     libXi
     libXfixes
+    libxkbcommon
     alsa-lib
-    vulkan-loader
   ]
   ++ lib.optional withPulseaudio libpulseaudio
   ++ lib.optional withDbus dbus
@@ -92,12 +94,6 @@ stdenv.mkDerivation rec {
   ++ lib.optional withFontconfig fontconfig.lib
   ++ lib.optional withUdev udev;
 
-  patches = [
-    # Godot expects to find xfixes inside xi, but nix's pkg-config only
-    # gives the libs for the requested package (ignoring the propagated-build-inputs)
-    ./xfixes.patch
-  ];
-
   enableParallelBuilding = true;
 
   # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py'
diff --git a/pkgs/development/tools/godot/4/xfixes.patch b/pkgs/development/tools/godot/4/xfixes.patch
deleted file mode 100644
index df5c914d7fd6d..0000000000000
--- a/pkgs/development/tools/godot/4/xfixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
-index 844b15e9fb..0c8bee1757 100644
---- a/platform/linuxbsd/detect.py
-+++ b/platform/linuxbsd/detect.py
-@@ -192,6 +192,7 @@ def configure(env: "Environment"):
-         env.ParseConfig("pkg-config xrandr --cflags")
-         env.ParseConfig("pkg-config xrender --cflags")
-         env.ParseConfig("pkg-config xi --cflags")
-+        env.ParseConfig("pkg-config xfixes --cflags")
- 
-     if env["touch"]:
-         env.Append(CPPDEFINES=["TOUCH_ENABLED"])