Unverified Commit 5b5deccd authored by Marcin Serwin's avatar Marcin Serwin Committed by GitHub
Browse files

parallel-launcher.parallel-n64-core: 2.27.1 -> 2.28.0, fix build with GCC 15 (#485839)

parents 6a1f8c60 d9acae03
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ in
# Based on the libretro parallel-n64 derivation with slight tweaks
libretro.mkLibretroCore (finalAttrs: {
  core = "parallel-n64-next";
  version = "2.27.1";
  version = "2.28.0";

  src = fetchFromGitLab {
    owner = "parallel-launcher";
    repo = "parallel-n64";
    tag = reformatVersion finalAttrs.version;
    hash = "sha256-u4F6CbC1NEU3OWtcqMIi/teX+SS4Jq9v5M2qc9z5bXg=";
    hash = "sha256-o5zF100TzAO7XQXau4rglr1rO+roJao43SSFhYPCPO0=";
  };

  extraNativeBuildInputs = [
@@ -45,6 +45,10 @@ libretro.mkLibretroCore (finalAttrs: {
    "ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
  ];

  # Fix build with GCC 15
  # Upstream issue: https://gitlab.com/parallel-launcher/parallel-n64/-/issues/18
  env.NIX_CFLAGS_COMPILE = "-std=gnu17";

  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
    sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
    && sed -i -e 's,CPUFLAGS  :=,,g' Makefile