From 4535a5aa356599c065ddcba6a8a4c3a7472af45f Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Sat, 11 Feb 2023 00:32:27 +0100
Subject: [PATCH] dolphin-emu: 5.0-17995 -> 5.0-18498

---
 .../emulators/dolphin-emu/default.nix         | 20 +++++++------------
 .../minizip-external-missing-include.patch    | 18 -----------------
 2 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch

diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
index 0e781fd7e130..b9ef4682e87d 100644
--- a/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -16,13 +16,14 @@
 , libevdev
 , libGL
 , libiconv
-, libpng
 , libpulseaudio
+, libspng
 , libusb1
 , libXdmcp
 , libXext
 , libXrandr
 , mbedtls_2
+, mgba
 , miniupnpc
 , minizip-ng
 , openal
@@ -53,22 +54,16 @@
 
 stdenv.mkDerivation rec {
   pname = "dolphin-emu";
-  version = "5.0-17995";
+  version = "5.0-18498";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "8bad821019721b9b72701b495da95656ace5fea5";
-    sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8=";
+    rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7";
+    sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # On x86_64-darwin CMake reportedly does not work without this in some cases.
-    # See https://github.com/NixOS/nixpkgs/pull/190373#issuecomment-1241310765
-    ./minizip-external-missing-include.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -85,8 +80,8 @@ stdenv.mkDerivation rec {
     hidapi
     libGL
     libiconv
-    libpng
     libpulseaudio
+    libspng
     libusb1
     libXdmcp
     mbedtls_2
@@ -105,6 +100,7 @@ stdenv.mkDerivation rec {
     libevdev
     libXext
     libXrandr
+    mgba # Derivation doesn't support Darwin
     udev
     vulkan-loader
   ] ++ lib.optionals stdenv.isDarwin [
@@ -137,8 +133,6 @@ stdenv.mkDerivation rec {
     # https://bugs.dolphin-emu.org/issues/11807
     # The .desktop file should already set this, but Dolphin may be launched in other ways
     "--set QT_QPA_PLATFORM xcb"
-    # https://bugs.dolphin-emu.org/issues/12913
-    "--set QT_XCB_NO_XI2 1"
   ];
 
   # https://github.com/NixOS/nixpkgs/issues/201254
diff --git a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch b/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch
deleted file mode 100644
index 7da013ecd8f6..000000000000
--- a/pkgs/applications/emulators/dolphin-emu/minizip-external-missing-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 5e0cb8066fb1653399c54e93e42375295c2562bd
-Author: Ivar Scholten <ivar.scholten@protonmail.com>
-Date:   Fri Sep 9 14:27:55 2022 +0200
-
-    Externals/minizip: add missing include to CheckFunctionExists
-
-diff --git a/Externals/minizip/CMakeLists.txt b/Externals/minizip/CMakeLists.txt
-index c3d7c5512e..f59f8b295c 100644
---- a/Externals/minizip/CMakeLists.txt
-+++ b/Externals/minizip/CMakeLists.txt
-@@ -60,6 +60,7 @@ if (HAVE_INTTYPES_H)
-   target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H)
- endif()
-
-+include(CheckFunctionExists)
- check_function_exists(fseeko HAVE_FSEEKO)
- if (NOT HAVE_FSEEKO)
-   target_compile_definitions(minizip PRIVATE NO_FSEEKO)