gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #173625 from trofi/fix-fno-common-for-brogue

Browse Source 
brogue: pull upstream fix for -fno-common toolchains
This commit is contained in:
Sandro
2022-05-19 19:31:29 +02:00
committed by GitHub
parent 0a96a355a5 a48f967809
commit 4c0b03f39c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/brogue/default.nix
+10 -1
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' \