nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

libretro: add aarch64 to ARCH, remove aarch64 specific code

Browse Source
This commit is contained in:
Thiago Kenji Okada 2023-03-13 12:44:52 +00:00
parent 31483211a3
commit dab6bebe7c
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/emulators/retroarch/cores.nix
View File

@ -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";

12
pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch
View File

@ -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

1
pkgs/applications/emulators/retroarch/mkLibretroCore.nix
View File

@ -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 [ ]);