Merge pull request #256878 from thiagokokada/bump-retroarch (05d7c36f) · Commits · nix / nixpkgs

pkgs/applications/emulators/retroarch/cores.nix

+24 −14

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ let
		mkLibretroCore =
		{ core
		, src ? (getCoreSrc core)
		, version ? "unstable-2023-03-13"
		, version ? "unstable-2023-09-24"
		, ...
		}@args:
		import ./mkLibretroCore.nix ({
		@@ -410,7 +410,9 @@ in

		flycast = mkLibretroCore {
		core = "flycast";
		extraNativeBuildInputs = [ cmake ];
		extraBuildInputs = [ libGL libGLU ];
		cmakeFlags = [ "-DLIBRETRO=ON" ];
		makefile = "Makefile";
		meta = {
		description = "Flycast libretro port";
		@@ -502,10 +504,17 @@ in

		mame = mkLibretroCore {
		core = "mame";
		extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ];
		extraNativeBuildInputs = [ python3 ];
		extraBuildInputs = [ alsa-lib libGLU libGL ];
		meta = {
		description = "Port of MAME to libretro";
		license = with lib.licenses; [ bsd3 gpl2Plus ];
		# Build fail with errors:
		# gcc: warning: <arch>: linker input file unused because linking not done
		# gcc: error: <arch>: linker input file not found: No such file or directory
		# Removing it from platforms instead of marking as broken to allow
		# retroarchFull to be built
		platforms = [ ];
		};
		};

		@@ -626,6 +635,13 @@ in
		src = getCoreSrc "mupen64plus";
		extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
		makefile = "Makefile";
		makeFlags = [
		"HAVE_PARALLEL_RDP=1"
		"HAVE_PARALLEL_RSP=1"
		"HAVE_THR_AL=1"
		"LLE=1"
		"WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}"
		];
		meta = {
		description = "Libretro port of Mupen64 Plus, GL only";
		license = lib.licenses.gpl3Only;
		@@ -698,6 +714,11 @@ in
		core = "parallel-n64";
		extraBuildInputs = [ libGLU libGL libpng ];
		makefile = "Makefile";
		makeFlags = [
		"HAVE_PARALLEL=1"
		"HAVE_PARALLEL_RSP=1"
		"ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
		];
		postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
		sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
		&& sed -i -e 's,CPUFLAGS :=,,g' Makefile
		@@ -852,19 +873,8 @@ in
		};
		};

		scummvm = mkLibretroCore rec {
		scummvm = mkLibretroCore {
		core = "scummvm";
		version = "unstable-2022-04-06";
		# Commit below introduces libretro platform, that uses libretro-{deps,common} as
		# submodules. We will probably need to introduce this as separate derivations,
		# but for now let's just use the last known version that does not use it.
		# https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada
		src = fetchFromGitHub {
		owner = "libretro";
		repo = core;
		rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3";
		hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=";
		};
		extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ];
		makefile = "Makefile";
		preConfigure = "cd backends/platform/libretro/build";

pkgs/applications/emulators/retroarch/default.nix

+2 −6

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		, alsa-lib
		, dbus
		, fetchFromGitHub
		, fetchpatch
		, ffmpeg_4
		, flac
		, freetype
		@@ -17,7 +16,6 @@
		, libGL
		, libGLU
		, libpulseaudio
		, libretro-core-info
		, libv4l
		, libX11
		, libXdmcp
		@@ -32,10 +30,8 @@
		, pkg-config
		, python3
		, qtbase
		, retroarch-assets
		, SDL2
		, spirv-tools
		, substituteAll
		, udev
		, vulkan-loader
		, wayland
		@@ -50,12 +46,12 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "retroarch-bare";
		version = "1.15.0";
		version = "1.16.0";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "RetroArch";
		hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc=";
		hash = "sha256-aP3/IDs18Q32efFlp4XYDKpdoAm2+QwzhrMxmt3pSvE=";
		rev = "v${version}";
		};

pkgs/applications/emulators/retroarch/hashes.json

+112 −111

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/emulators/retroarch/libretro-core-info.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@

		stdenvNoCC.mkDerivation rec {
		pname = "libretro-core-info";
		version = "1.15.0";
		version = "unstable-2023-07-31";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "libretro-core-info";
		hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA=";
		rev = "v${version}";
		hash = "sha256-VdFsrLiJ+Wu1OKvwX9fMI96CxTareOTK8x6OfksBuYs=";
		rev = "dacae85b406131feb12395a415fdf57fc4745201";
		};

		makeFlags = [

pkgs/applications/emulators/retroarch/retroarch-assets.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@

		stdenvNoCC.mkDerivation rec {
		pname = "retroarch-assets";
		version = "unstable-2022-10-24";
		version = "unstable-2023-09-11";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "retroarch-assets";
		rev = "4ec80faf1b5439d1654f407805bb66141b880826";
		hash = "sha256-j1npVKEknq7hpFr/XfST2GNHI5KnEYjZAM0dw4tMsYk=";
		rev = "7b735ef18bcc6508b1c9a626eb237779ff787179";
		hash = "sha256-S9wWag9fNpCTMKY8yQaF7jFuX1P5XLy/Z4vjtVDK7lg=";
		};

		makeFlags = [

Admin message