Merge pull request #306979 from atorres1985-contrib/melonDS

melonDS: 0.9.5-unstable-2024-01-17 -> 0.9.5-unstable-2024-04-18
This commit is contained in:
Benjamin Staffin 2024-04-26 11:26:55 -04:00 committed by GitHub
commit fb5333d5e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 6 deletions

View File

@ -3,13 +3,14 @@
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, fetchFromGitHub , fetchFromGitHub
, libGL
, libarchive , libarchive
, libpcap , libpcap
, libsForQt5 , libsForQt5
, libslirp , libslirp
, libGL
, pkg-config , pkg-config
, stdenv , stdenv
, unstableGitUpdater
, wayland , wayland
, zstd , zstd
}: }:
@ -22,13 +23,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "melonDS"; pname = "melonDS";
version = "0.9.5-unstable-2024-01-17"; version = "0.9.5-unstable-2024-04-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "melonDS-emu"; owner = "melonDS-emu";
repo = "melonDS"; repo = "melonDS";
rev = "7897bd387bfd37615a049eba28d02dc23cfa5194"; rev = "ba8d547dfa81539f4e8474152d92e866ad89241b";
hash = "sha256-7BrUa8QJnudJkiCtuBdfar+FeeJSrdMGJdhXrPP6uww="; hash = "sha256-va4KegM2z0GSA43goUynRPNPvQnrV2b8oNOfLKPE+Zc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -55,9 +56,30 @@ stdenv.mkDerivation (finalAttrs: {
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
]; ];
passthru = {
updateScript = unstableGitUpdater { };
};
meta = { meta = {
homepage = "https://melonds.kuribo64.net/"; homepage = "https://melonds.kuribo64.net/";
description = "Work in progress Nintendo DS emulator"; 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 ]; license = with lib.licenses; [ gpl3Plus ];
mainProgram = "melonDS"; mainProgram = "melonDS";
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [

View File

@ -2736,8 +2736,6 @@ with pkgs;
description = mame.meta.description + " (tools only)"; description = mame.meta.description + " (tools only)";
} (lib.getOutput "tools" mame); } (lib.getOutput "tools" mame);
melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; mgba = libsForQt5.callPackage ../applications/emulators/mgba { };
mupen64plus = callPackage ../applications/emulators/mupen64plus { }; mupen64plus = callPackage ../applications/emulators/mupen64plus { };