BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brogue: pull upstream fix for -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-05-19 15:18:04 +01:00
parent f25d106e1d
commit a48f967809
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/games/brogue/default.nix
View file

@ -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' \