Skip to content

Commit

Permalink
Merge pull request #306979 from atorres1985-contrib/melonDS
Browse files Browse the repository at this point in the history
melonDS: 0.9.5-unstable-2024-01-17 -> 0.9.5-unstable-2024-04-18
  • Loading branch information
benley authored Apr 26, 2024
2 parents e07f196 + d3a2542 commit fb5333d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
, cmake
, extra-cmake-modules
, fetchFromGitHub
, libGL
, libarchive
, libpcap
, libsForQt5
, libslirp
, libGL
, pkg-config
, stdenv
, unstableGitUpdater
, wayland
, zstd
}:
Expand All @@ -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 = [
Expand All @@ -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; [
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down

0 comments on commit fb5333d

Please sign in to comment.