From adddd36466b315a9aa6760209528e9f67a5b7dda Mon Sep 17 00:00:00 2001
From: useranon350 <useranon350@gmail.com>
Date: Thu, 13 Feb 2025 21:36:51 -0500
Subject: [PATCH] cemu: 2.4 -> 2.5

---
 pkgs/by-name/ce/cemu/0002-cemu-imgui.patch | 13 +++++++++++++
 pkgs/by-name/ce/cemu/package.nix           | 13 ++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ce/cemu/0002-cemu-imgui.patch

diff --git a/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch
new file mode 100644
index 000000000000..96f95b9687cc
--- /dev/null
+++ b/pkgs/by-name/ce/cemu/0002-cemu-imgui.patch
@@ -0,0 +1,13 @@
+diff --git a/src/imgui/imgui_extension.cpp b/src/imgui/imgui_extension.cpp
+index f1c072f..e3e901d 100644
+--- a/src/imgui/imgui_extension.cpp
++++ b/src/imgui/imgui_extension.cpp
+@@ -129,8 +129,6 @@ void ImGui_UpdateWindowInformation(bool mainWindow)
+ 	io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
+ #if BOOST_OS_WINDOWS
+ 	io.ImeWindowHandle = mainWindow ? g_window_info.window_main.hwnd : g_window_info.window_pad.hwnd;
+-#else
+-	io.ImeWindowHandle = nullptr;
+ #endif
+ 
+ 	io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 191ece85ab31..28c90ea1d828 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -34,24 +34,25 @@
   wrapGAppsHook3,
   wxGTK32,
   zarchive,
+  bluez,
 }:
 
 let
-  # cemu doesn't build with imgui 1.90.2 or newer:
-  # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle'
+  # cemu doesn't build with imgui 1.91.4 or newer:
+  # before v1.91.4 (2024/10/08) the default type for ImTextureID was void*.
   imgui' = imgui.overrideAttrs rec {
-    version = "1.90.1";
+    version = "1.91.3";
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
       rev = "v${version}";
-      hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg=";
+      hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY=";
     };
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cemu";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "cemu-project";
@@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/cemu-project/Cemu/commit/2b0cbf7f6b6c34c748585d255ee7756ff592a502.patch";
       hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI=";
     })
+    ./0002-cemu-imgui.patch
   ];
 
   nativeBuildInputs = [
@@ -106,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     wxGTK32
     zarchive
+    bluez
   ];
 
   cmakeFlags = [