diff options
Diffstat (limited to 'pkgs/games/brogue/default.nix')
| -rw-r--r-- | pkgs/games/brogue/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index d4f1f8faeeb..e5b0f838be1 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,10 +8,19 @@ 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' \ - -e 's,sdl-config,${SDL.dev}/bin/sdl-config,g' + -e 's,sdl-config,${lib.getDev SDL}/bin/sdl-config,g' sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g" make clean rm -rf src/libtcod* |