diff options
| author | Christoph Hrdinka <c.github@hrdinka.at> | 2020-10-29 09:31:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 09:31:19 +0100 |
| commit | 67b292a1f55c4737ba69aa7dace254dfa400e1d8 (patch) | |
| tree | 7debe7c9b48b0df26cd5e84b57834130eae79491 /pkgs/misc | |
| parent | df6068e934ad2ea8db02609c335b23ac96c3d286 (diff) | |
| parent | 8880179b653648abce4208654695d9276e9fd036 (diff) | |
Merge pull request #101949 from AluisioASG/aasg/libretro-mame2016
libretro.mame2016: fix build with Make 4.3
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 17b1679ed5bab..2b9cb5e6d27e5 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch +{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL , ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl @@ -630,6 +630,13 @@ in with stdenv.lib.licenses; rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d"; sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh"; }; + patches = [ + (fetchpatch { + name = "fix_mame_build_on_make-4.3.patch"; + url = "https://github.com/libretro/mame2016-libretro/commit/5874fae3d124f5e7c8a91634f5473a8eac902e47.patch"; + sha256 = "061f1lcm72glksf475ikl8w10pnbgqa7049ylw06nikis2qdjlfn"; + }) + ]; description = "Port of MAME ~2016 to libretro"; license = gpl2Plus; extraNativeBuildInputs = [ python27 ]; |