diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-06 11:02:25 -0300 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-06 19:21:20 -0300 |
| commit | b404c39faa327a872b91be75897461f594d1ab70 (patch) | |
| tree | 9cb566e3aec49db014e234b1bdcce298a8a3169f /pkgs/misc/emulators/retroarch/cores.nix | |
| parent | 3630026040b39cd82f32820bb518d47d85e2ffef (diff) | |
| download | nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar.gz nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar.bz2 nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar.lz nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar.xz nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.tar.zst nixpkgs-b404c39faa327a872b91be75897461f594d1ab70.zip | |
libretro: unstable-2021-11-22 -> unstable-2021-12-06
Also, migrate old MAME cores to build with Python 3 instead of Python 2.
Diffstat (limited to 'pkgs/misc/emulators/retroarch/cores.nix')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index b09af281166..63a552ff23b 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -30,7 +30,6 @@ , pcre , pkg-config , portaudio -, python27 , python3 , retroarch , sfml @@ -58,7 +57,7 @@ let , license , src ? null , broken ? false - , version ? "unstable-2021-11-22" + , version ? "unstable-2021-12-06" , platforms ? retroarch.meta.platforms , ... }@args: @@ -536,7 +535,8 @@ in core = "mame2015"; description = "Port of MAME ~2015 to libretro"; license = "MAME"; - extraNativeBuildInputs = [ python27 ]; + makeFlags = [ "PYTHON=python3" ]; + extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; enableParallelBuilding = false; @@ -544,17 +544,11 @@ in mame2016 = mkLibRetroCore { core = "mame2016"; - 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 = with lib.licenses; [ bsd3 gpl2Plus ]; - extraNativeBuildInputs = [ python27 ]; + extraNativeBuildInputs = [ python3 ]; extraBuildInputs = [ alsa-lib ]; + makeFlags = [ "PYTHON_EXECUTABLE=python3" ]; postPatch = '' # Prevent the failure during the parallel building of: # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o @@ -674,7 +668,6 @@ in pcsx2 = mkLibRetroCore { core = "pcsx2"; - version = "unstable-2021-11-27"; description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; extraNativeBuildInputs = [ |