pyrox.dev
Merge pull request #172764 from trofi/fix-fno-common-for-chocolateDoom
chocolateDoom: pull upstream fix for -fno-common toolchains
authored by Guillaume Girol and committed by GitHub 0fd58ede 902fe7c1
+11
-1
pkgs/games/chocolate-doom/default.nix
+11
-1
pkgs/games/chocolate-doom/default.nix
···
1
-
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:
1
+
{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "chocolate-doom";
···
10
10
rev = "${pname}-${version}";
11
11
sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp";
12
12
};
13
+
14
+
patches = [
15
+
# Pull upstream patch to fix builx against gcc-10:
16
+
# https://github.com/chocolate-doom/chocolate-doom/pull/1257
17
+
(fetchpatch {
18
+
name = "fno-common.patch";
19
+
url = "https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2.patch";
20
+
sha256 = "1dmbygn952sy5n8qqp0asg11pmygwgygl17lrj7i0fxa0nrhixhj";
21
+
})
22
+
];
13
23
14
24
postPatch = ''
15
25
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am