diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-05 18:55:30 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-05 18:55:30 +0100 |
| commit | cb3d27df93d54dd913aa3348c996f4ed372d1c20 (patch) | |
| tree | 602c0f0c643f88699117f5191b2c9a805d77a65b /pkgs/misc/emulators | |
| parent | aff1f4ab948b921ceaf2b81610f2f82454302b4b (diff) | |
| parent | 4e8853ca8d46988d283bc06a4c7cd6cf68a25576 (diff) | |
| download | nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.gz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.bz2 nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.lz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.xz nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.tar.zst nixlib-cb3d27df93d54dd913aa3348c996f4ed372d1c20.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 17 |
1 files changed, 15 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 { |