From c2955d3032f88bb63bc0fc3971d49efbd8d2554d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Apr 2024 10:23:41 -0300
Subject: [PATCH 1/2] melonDS: migrate to by-name

---
 .../melonDS/default.nix => by-name/me/melonDS/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/emulators/melonDS/default.nix => by-name/me/melonDS/package.nix} (100%)

diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/by-name/me/melonDS/package.nix
similarity index 100%
rename from pkgs/applications/emulators/melonDS/default.nix
rename to pkgs/by-name/me/melonDS/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c855e31dc2cc2..7bc821761088d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2736,8 +2736,6 @@ with pkgs;
     description = mame.meta.description + " (tools only)";
   } (lib.getOutput "tools" mame);
 
-  melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
-
   mgba = libsForQt5.callPackage ../applications/emulators/mgba { };
 
   mupen64plus = callPackage ../applications/emulators/mupen64plus { };

From d3a2542d8559f13d2846c78d1c015374434d2da5 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Apr 2024 10:30:23 -0300
Subject: [PATCH 2/2] melonDS: 0.9.5-unstable-2024-01-17 ->
 0.9.5-unstable-2024-04-18

---
 pkgs/by-name/me/melonDS/package.nix | 30 +++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index bb0499f97277d..334b5909496c7 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -3,13 +3,14 @@
 , cmake
 , extra-cmake-modules
 , fetchFromGitHub
+, libGL
 , libarchive
 , libpcap
 , libsForQt5
 , libslirp
-, libGL
 , pkg-config
 , stdenv
+, unstableGitUpdater
 , wayland
 , zstd
 }:
@@ -22,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "0.9.5-unstable-2024-01-17";
+  version = "0.9.5-unstable-2024-04-18";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "7897bd387bfd37615a049eba28d02dc23cfa5194";
-    hash = "sha256-7BrUa8QJnudJkiCtuBdfar+FeeJSrdMGJdhXrPP6uww=";
+    rev = "ba8d547dfa81539f4e8474152d92e866ad89241b";
+    hash = "sha256-va4KegM2z0GSA43goUynRPNPvQnrV2b8oNOfLKPE+Zc=";
   };
 
   nativeBuildInputs = [
@@ -55,9 +56,30 @@ stdenv.mkDerivation (finalAttrs: {
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
   ];
 
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
   meta = {
     homepage = "https://melonds.kuribo64.net/";
     description = "Work in progress Nintendo DS emulator";
+    longDescription = ''
+      melonDS aims at providing fast and accurate Nintendo DS emulation. While
+      it is still a work in progress, it has a pretty solid set of features:
+
+      - Nearly complete core (CPU, video, audio, ...)
+      - JIT recompiler for fast emulation
+      - OpenGL renderer, 3D upscaling
+      - RTC, microphone, lid close/open
+      - Joystick support
+      - Savestates
+      - Various display position/sizing/rotation modes
+      - (WIP) Wifi: local multiplayer, online connectivity
+      - (WIP) DSi emulation
+      - DLDI
+      - (WIP) GBA slot add-ons
+      - and more are planned!
+    '';
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "melonDS";
     maintainers = with lib.maintainers; [