diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2022-10-02 21:52:28 +0100 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2022-10-02 21:52:28 +0100 |
| commit | 650e434781a3b0458a610132d0cf1a6d1152f0c1 (patch) | |
| tree | 05dbab30162a55ddb3c50f66e6ba4fd4f712bf5c /pkgs/applications/emulators/retroarch | |
| parent | 400b95cfb94e78f68c1e48e37e19f0c724d4039a (diff) | |
libretro.flycast: fix aarch64-linux build
Diffstat (limited to 'pkgs/applications/emulators/retroarch')
| -rw-r--r-- | pkgs/applications/emulators/retroarch/cores.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 7d4526f59456..3d35337cccc9 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -394,7 +394,8 @@ in license = lib.licenses.gpl2Only; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; + patches = [ ./fix-flycast-makefile.patch ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch new file mode 100644 index 000000000000..a067839c7c32 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch @@ -0,0 +1,12 @@ +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 |