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

Merge pull request #172764 from trofi/fix-fno-common-for-chocolateDoom

Browse Source 
chocolateDoom: pull upstream fix for -fno-common toolchains
This commit is contained in:
Guillaume Girol
2022-05-21 19:55:57 +00:00
committed by GitHub
parent 902fe7c103 a679de55a4
commit 0fd58eded9
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/chocolate-doom/default.nix
+11 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "chocolate-doom";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp";
};
patches = [
# Pull upstream patch to fix builx against gcc-10:
# https://github.com/chocolate-doom/chocolate-doom/pull/1257
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch";
sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj";
})
];
postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
'';