diff options
-rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 07d665503791..332357e317e3 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch -, fluidsynth, mesa, SDL, ffmpeg, libpng, libjpeg, libvorbis, zlib }: +, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg +, libvorbis, zlib }: let @@ -33,7 +34,7 @@ let inherit description; homepage = "http://www.libretro.com/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo MP2E ]; + maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.linux; }; } // a); @@ -133,6 +134,18 @@ in description = "Enhanced Genesis Plus libretro port"; }; + mame = mkLibRetroCore { + core = "mame"; + src = fetchRetro { + repo = "mame"; + rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74"; + sha256 = "0rzy5klp8vf9vc8fylbdnp2qcvl1nkgw5a55ljqc5vich4as5alq"; + }; + description = "Port of MAME to libretro"; + + extraBuildInputs = [ alsaLib portaudio python27 ]; + }; + mednafen-pce-fast = (mkLibRetroCore rec { core = "mednafen-pce-fast"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c67b0d79c3c..eac026add04f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14043,6 +14043,7 @@ let ++ optional (cfg.enableFceumm or false) fceumm ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx + ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia |