Skip to content

Commit 6205910

Browse files
authored
libretro.mupen64plus: add patches for GCC14 (NixOS#368796)
2 parents 711b3e5 + c4c8794 commit 6205910

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

pkgs/applications/emulators/libretro/cores/mupen64plus.nix

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5+
fetchpatch2,
56
libGL,
67
libGLU,
78
libpng,
@@ -20,6 +21,26 @@ mkLibretroCore {
2021
hash = "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI=";
2122
};
2223

24+
# Fix for GCC 14
25+
# https://github.com/libretro/mupen64plus-libretro-nx/pull/526
26+
patches = [
27+
(fetchpatch2 {
28+
name = "minizip-avoid_trying_to_compile_problematic_code.patch";
29+
url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/2b05477dd9cd99e7f9425f58cb544f454fc0d813.patch?full_index=1";
30+
hash = "sha256-Q0yymeS6taeFRt6BH6IX5q1SDUMh2Zn3mFpdJguyk9M=";
31+
})
32+
(fetchpatch2 {
33+
name = "EmuThread-align_with_co_create()_and_pthread_create().patch";
34+
url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/26dfd670ffdd5ed6a03e6704dc73f82c13d81dd9.patch?full_index=1";
35+
hash = "sha256-BraCR/b8DTmVAWrUxiXp9nxBYvTpTW9OQAt8TP1eusI=";
36+
})
37+
(fetchpatch2 {
38+
name = "Fix_compilation_of_bundled_libzlib.patch";
39+
url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
40+
hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
41+
})
42+
];
43+
2344
extraBuildInputs = [
2445
libGLU
2546
libGL

0 commit comments

Comments
 (0)