diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-02-04 20:28:53 +0000 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-02-04 20:34:37 +0000 |
| commit | 0a88b3309adb05c760800735bdc8346c3ad62fa3 (patch) | |
| tree | 6b78118f567cfaabed68270c322c46df5271a27b | |
| parent | 72cb730ea6f061f6ff20ea381484414843761680 (diff) | |
| download | nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar.gz nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar.bz2 nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar.lz nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar.xz nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.tar.zst nixlib-0a88b3309adb05c760800735bdc8346c3ad62fa3.zip | |
libretro.pcsx2: use gcc12Stdenv
| -rw-r--r-- | pkgs/applications/emulators/retroarch/cores.nix | 14 | ||||
| -rwxr-xr-x | pkgs/applications/emulators/retroarch/update_cores.py | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 2d59bfa36d53..5447942488f5 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -790,18 +790,18 @@ in xxd ]; makefile = "Makefile"; - cmakeFlags = [ - "-DLIBRETRO=ON" - ]; + cmakeFlags = [ "-DLIBRETRO=ON" ]; + # remove ccache postPatch = '' - # remove ccache substituteInPlace CMakeLists.txt --replace "ccache" "" ''; - + postBuild = "cd pcsx2"; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - - postBuild = "cd pcsx2"; + # FIXME: multiple build errors with GCC13. + # Unlikely to be fixed until we switch to libretro/pcsx2 that is a more + # up-to-date port (but still WIP). + stdenv = gcc12Stdenv; meta = { description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 9a92b6165e86..981fe5377c5d 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -85,8 +85,9 @@ CORES = { "opera": {"repo": "opera-libretro"}, "parallel-n64": {"repo": "parallel-n64"}, # libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target - # only libretro, while libretro/pcsx2 is supposedly closer to upstream. - # TODO: switch to libretro/pcsx2 since this is more up-to-date + # only libretro, while libretro/pcsx2 is supposedly closer to upstream but + # it is a WIP. + # TODO: switch to libretro/pcsx2 when upstream switches to it. "pcsx2": {"repo": "lrps2"}, "pcsx_rearmed": {"repo": "pcsx_rearmed"}, "picodrive": {"repo": "picodrive", "fetch_submodules": True}, |