diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-08-06 20:04:14 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-08-06 20:07:53 +0100 |
commit | 25fed6c0eeb90db78af32ffb819d083e0b5b0af6 (patch) | |
tree | cb6eb582a3b65aa2e15170a6a2c1d926226463a5 | |
parent | 4b68f2cde57decc57a539778b37d0dffd81af068 (diff) | |
download | nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar.gz nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar.bz2 nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar.lz nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar.xz nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.tar.zst nixpkgs-25fed6c0eeb90db78af32ffb819d083e0b5b0af6.zip |
wesnoth: backport gcc-13 fix
Without the change `wesnoth` fails to build against `gcc-13` as: $ nix build --impure --expr 'with import <nixpkgs> {}; wesnoth.override { stdenv = gcc13Stdenv; }' -L In file included from /build/source/src/serialization/base64.cpp:16: /build/source/src/serialization/base64.hpp:23:49: error: 'uint8_t' was not declared in this scope 23 | using byte_string_view = std::basic_string_view<uint8_t>; | ^~~~~~~ /build/source/src/serialization/base64.hpp:20:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? 19 | #include <vector> +++ |+#include <cstdint> 20 |
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 2bed9e435fc..df5b393ccde 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -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 |