pyrox.dev / nixpkgs
lol
fork atom

libretro: add aarch64 to ARCH, remove aarch64 specific code

Thiago Kenji Okada dab6bebe 31483211

+1 -15
unified split
-3
pkgs/applications/emulators/retroarch/cores.nix
··· 400 400 core = "flycast"; 401 401 extraBuildInputs = [ libGL libGLU ]; 402 402 makefile = "Makefile"; 403 - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; 404 - patches = [ ./fix-flycast-makefile.patch ]; 405 403 meta = { 406 404 description = "Flycast libretro port"; 407 405 license = lib.licenses.gpl2Only; ··· 735 733 picodrive = mkLibretroCore { 736 734 core = "picodrive"; 737 735 dontConfigure = true; 738 - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; 739 736 meta = { 740 737 description = "Fast MegaDrive/MegaCD/32X emulator"; 741 738 license = "MAME";
-12
pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
··· 1 - diff --git a/Makefile b/Makefile 2 - index 01d99c30..8c2dd248 100644 3 - --- a/Makefile 4 - +++ b/Makefile 5 - @@ -440,7 +440,6 @@ else ifeq ($(platform), arm64) 6 - CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers 7 - CFLAGS += $(CPUFLAGS) 8 - CXXFLAGS += $(CPUFLAGS) 9 - - ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize 10 - PLATFORM_EXT := unix 11 - WITH_DYNAREC=arm64 12 - HAVE_GENERIC_JIT = 0
+1
pkgs/applications/emulators/retroarch/mkLibretroCore.nix
··· 53 53 "ARCH=${{ 54 54 armv7l = "arm"; 55 55 armv6l = "arm"; 56 + aarch64 = "arm64"; 56 57 i686 = "x86"; 57 58 }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" 58 59 ] ++ (args.makeFlags or [ ]);