From dab6bebe7c3347967a2de1880f634e40011ea408 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 13 Mar 2023 12:44:52 +0000
Subject: [PATCH] libretro: add aarch64 to ARCH, remove aarch64 specific code

---
 pkgs/applications/emulators/retroarch/cores.nix      |  3 ---
 .../emulators/retroarch/fix-flycast-makefile.patch   | 12 ------------
 .../emulators/retroarch/mkLibretroCore.nix           |  1 +
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch

diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index bb3e1614bfee..569265d1a7f6 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -400,8 +400,6 @@ in
     core = "flycast";
     extraBuildInputs = [ libGL libGLU ];
     makefile = "Makefile";
-    makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
-    patches = [ ./fix-flycast-makefile.patch ];
     meta = {
       description = "Flycast libretro port";
       license = lib.licenses.gpl2Only;
@@ -735,7 +733,6 @@ in
   picodrive = mkLibretroCore {
     core = "picodrive";
     dontConfigure = true;
-    makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
     meta = {
       description = "Fast MegaDrive/MegaCD/32X emulator";
       license = "MAME";
diff --git a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
deleted file mode 100644
index a067839c7c32..000000000000
--- a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 01d99c30..8c2dd248 100644
---- a/Makefile
-+++ b/Makefile
-@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64)
- 	CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers
- 	CFLAGS += $(CPUFLAGS)
- 	CXXFLAGS += $(CPUFLAGS)
--	ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize
- 	PLATFORM_EXT := unix
- 	WITH_DYNAREC=arm64
- 	HAVE_GENERIC_JIT = 0
diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix
index 829b96387f11..bc457d0cb702 100644
--- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix
+++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation ({
     "ARCH=${{
       armv7l = "arm";
       armv6l = "arm";
+      aarch64 = "arm64";
       i686 = "x86";
     }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}"
   ] ++ (args.makeFlags or [ ]);