Merge pull request #247562 from trofi/wesnoth-gcc-13-fix
wesnoth: backport gcc-13 fix
This commit is contained in:
commit
2600d09113
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
|
||||
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
|
||||
, Cocoa, Foundation
|
||||
}:
|
||||
|
@ -14,6 +15,16 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix https://github.com/wesnoth/wesnoth/pull/6726
|
||||
# for gcc-13 support.
|
||||
(fetchpatch {
|
||||
name = "gcc-134.patch";
|
||||
url = "https://github.com/wesnoth/wesnoth/commit/f073493ebc279cefa391d364c48265058795e1d2.patch";
|
||||
hash = "sha256-uTB65DEBZwHFRgDwNx/yVjzmnW3jRoiibadXhNcwMkI=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
|
||||
|
|
Loading…
Reference in a new issue