pyrox.dev
Merge pull request #185239 from chvp/zeroad-gcc10
zeroad: apply patch to fix build with gcc 11 and glibc 2.35
authored by Martin Weinelt and committed by GitHub 14ce12c4 d236188f
+9
-2
pkgs/games/0ad/game.nix
+9
-2
pkgs/games/0ad/game.nix
···
1
-
{ stdenv, lib, perl, fetchurl, python3, fmt, libidn
1
+
{ stdenv, lib, fetchpatch, perl, fetchurl, python3, fmt, libidn
2
2
, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium
3
3
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
4
4
, openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2
···
50
50
"-I${fmt.dev}/include"
51
51
];
52
52
53
-
patches = [ ./rootdir_env.patch ];
53
+
patches = [
54
+
./rootdir_env.patch
55
+
(fetchpatch {
56
+
# fix build with gcc11 and glibc 2.35
57
+
url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch";
58
+
hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0=";
59
+
})
60
+
];
54
61
55
62
configurePhase = ''
56
63
# Delete shipped libraries which we don't need.