From 28923d5072f76ef8296ce1165b626ac654ba5a3b Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Tue, 24 Mar 2026 14:10:23 +0200
Subject: [PATCH 1/2] rmg: patch includes that cause errors

---
 pkgs/by-name/rm/rmg/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index c4a1d31452d7..03063b819cbd 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   gitUpdater,
   boost,
   cmake,
@@ -39,6 +40,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-d2kUUJTZhm5m7MIZ8Ym0wyBvX2+h/FsrRQoyLTi0/N8=";
   };
 
+  # Fixes include errors from including minizip libraries
+  patches = [
+    (fetchpatch2 {
+      name = "0000-fix-minizip-include-archive";
+      url = "https://github.com/Rosalie241/RMG/commit/7e4e402f277803d3a998e96ea04064063bd1551a.patch";
+      hash = "sha256-uyEYv2r7J2nou9AHkezEX0LS/mOnIa6lbQqhxHY9ibo=";
+    })
+    (fetchpatch2 {
+      name = "0001-fix-minizip-include-mupen64plus-core";
+      url = "https://github.com/Rosalie241/RMG/commit/8ee3410680c247dcfee806562073626a0b7bf46b.patch";
+      hash = "sha256-29zg90ScPNizWq3BzNuM6yfCwmMXRYFfbjOg3YpCrGI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     nasm

From 41326ad76f7e62d38a64c4e9f06930ed29175889 Mon Sep 17 00:00:00 2001
From: langsjo <104687438+langsjo@users.noreply.github.com>
Date: Tue, 24 Mar 2026 14:10:34 +0200
Subject: [PATCH 2/2] rmg: 0.8.8 -> 0.8.9

---
 pkgs/by-name/rm/rmg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix
index 03063b819cbd..8f5707c82b09 100644
--- a/pkgs/by-name/rm/rmg/package.nix
+++ b/pkgs/by-name/rm/rmg/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rmg";
-  version = "0.8.8";
+  version = "0.8.9";
 
   src = fetchFromGitHub {
     owner = "Rosalie241";
     repo = "RMG";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d2kUUJTZhm5m7MIZ8Ym0wyBvX2+h/FsrRQoyLTi0/N8=";
+    hash = "sha256-L8fA2D1BQWhJiygHmbOmINBFk27X2Vd7zHCGnElM9EE=";
   };
 
   # Fixes include errors from including minizip libraries