b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #247562 from trofi/wesnoth-gcc-13-fix

Browse source 
wesnoth: backport gcc-13 fix
This commit is contained in:
Artturi 2023-08-13 06:47:34 +03:00 committed by GitHub
parent 86ebbdd9c0 25fed6c0ee
commit 2600d09113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/games/wesnoth/default.nix
View file

@ -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