From dc4bf03baad1704852c02f08717c301e7af76b4e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 5 Aug 2022 13:37:48 +0200 Subject: [PATCH] zeroad: apply patch to fix build with gcc 11 and glibc 2.35 0ad defines a variabel M_PIf, which is also included in math.h since gcc 11. This leads to the following build failure: https://hydra.nixos.org/build/186330284 --- pkgs/games/0ad/game.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 34a2cdddac820..1c21266fa4157 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perl, fetchurl, python3, fmt, libidn +{ stdenv, lib, fetchpatch, perl, fetchurl, python3, fmt, libidn , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 @@ -50,7 +50,13 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; - patches = [ ./rootdir_env.patch ]; + patches = [ + ./rootdir_env.patch + (fetchpatch { + url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch"; + hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0="; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need.