pyrox.dev
Merge pull request #247562 from trofi/wesnoth-gcc-13-fix
wesnoth: backport gcc-13 fix
+12
-1
pkgs/games/wesnoth/default.nix
+12
-1
pkgs/games/wesnoth/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
2
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
3
, Cocoa, Foundation
4
}:
···
13
repo = "wesnoth";
14
hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM=";
15
};
16
17
nativeBuildInputs = [ cmake pkg-config ];
18
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch
2
+
, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
3
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
4
, Cocoa, Foundation
5
}:
···
14
repo = "wesnoth";
15
hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM=";
16
};
17
+
18
+
patches = [
19
+
# Pull upstream fix https://github.com/wesnoth/wesnoth/pull/6726
20
+
# for gcc-13 support.
21
+
(fetchpatch {
22
+
name = "gcc-134.patch";
23
+
url = "https://github.com/wesnoth/wesnoth/commit/f073493ebc279cefa391d364c48265058795e1d2.patch";
24
+
hash = "sha256-uTB65DEBZwHFRgDwNx/yVjzmnW3jRoiibadXhNcwMkI=";
25
+
})
26
+
];
27
28
nativeBuildInputs = [ cmake pkg-config ];
29