diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-08 15:57:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 15:57:26 +0100 |
commit | d41de375cb00c09f62f1da4f3e52c0c246716137 (patch) | |
tree | 56e00ea82a1d58b6f7bca85e59fc69831f33fc22 | |
parent | a51e98b174cdae3abc548b698abf162e655b7b47 (diff) | |
parent | 7a83442851a0c09a07851f4f9cc88fe4d8f73ea5 (diff) | |
download | nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar.gz nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar.bz2 nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar.lz nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar.xz nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.tar.zst nixlib-d41de375cb00c09f62f1da4f3e52c0c246716137.zip |
Merge pull request #291128 from kurnevsky/wesnoth-bump
-rw-r--r-- | pkgs/games/wesnoth/default.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index df5b393ccded..9afbdf1913b0 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation @@ -6,25 +6,15 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.9"; + version = "1.16.11"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - hash = "sha256-KtAPc2nsqSoHNsLTLom/yaUECn+IWBdBFpiMclrUHxM="; + hash = "sha256-nnAMMc1pPYOziaHGUfh8LevECBb/lzCkaPyzFWs4zTY="; }; - 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 |