From a48f96780911ea828a05f95a57fe02c1e4fa5318 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 19 May 2022 15:18:04 +0100 Subject: [PATCH] brogue: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: src/brogue/Time.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51: multiple definition of `messageArchive'; src/brogue/Architect.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51: first defined here --- pkgs/games/brogue/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index d4f1f8faeeb..891c9a40ec1 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }: +{ lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }: stdenv.mkDerivation rec { pname = "brogue"; @@ -8,6 +8,15 @@ stdenv.mkDerivation rec { url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2"; sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/tmewett/BrogueCE/pull/63 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/tmewett/BrogueCE/commit/2c7ed0c48d9efd06bf0a2589ba967c0a22a8fa87.patch"; + sha256 = "19lr2fa25dh79klm4f4kqyyqq7w5xmw9z0fvylkcckqvcv7dwhp3"; + }) + ]; prePatch = '' sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \