From f3d53e22f75cf7219d5ef75eb7b2fc5bcfcd4649 Mon Sep 17 00:00:00 2001
From: bloominstrong <github@mail.bloominstrong.net>
Date: Wed, 9 Oct 2024 21:36:46 +1000
Subject: [PATCH] mupen64plus: 2.5.9 -> 2.6.0

https://github.com/mupen64plus/mupen64plus-core/blob/2.6.0/RELEASE
---
 pkgs/by-name/mu/mupen64plus/package.nix | 50 ++++++++++++++++---------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix
index 81c86eeafecb..5206d4abc37d 100644
--- a/pkgs/by-name/mu/mupen64plus/package.nix
+++ b/pkgs/by-name/mu/mupen64plus/package.nix
@@ -1,29 +1,45 @@
-{lib, stdenv, fetchurl, fetchpatch, boost, dash, freetype, libpng, pkg-config, SDL, which, zlib, nasm }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  boost,
+  dash,
+  freetype,
+  libpng,
+  libGLU,
+  pkg-config,
+  SDL2,
+  which,
+  zlib,
+  nasm,
+  vulkan-loader,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mupen64plus";
-  version = "2.5.9";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/mupen64plus-bundle-src-${version}.tar.gz";
-    sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m";
+    sha256 = "sha256-KX4XGAzXanuOqAnRob4smO1cc1LccWllqA3rWYsh4TE=";
   };
 
-  patches = [
-    # Pull upstream fix for -fno-common toolchains:
-    #  https://github.com/mupen64plus/mupen64plus-core/pull/736
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/mupen64plus/mupen64plus-core/commit/39975200ad4926cfc79c96609b64696289065502.patch";
-      sha256 = "0kdshp9xdkharn3d1g1pvxhh761pa1v5w07iq0wf9l380r2m6gbv";
-      # a/something -> a/source/mupen64plus-core/something
-      stripLen = 1;
-      extraPrefix = "source/mupen64plus-core/";
-    })
+  nativeBuildInputs = [
+    pkg-config
+    nasm
+  ];
+  buildInputs = [
+    boost
+    dash
+    freetype
+    libpng
+    libGLU
+    SDL2
+    which
+    zlib
+    vulkan-loader
   ];
-
-  nativeBuildInputs = [ pkg-config nasm ];
-  buildInputs = [ boost dash freetype libpng SDL which zlib ];
 
   buildPhase = ''
     dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus"