colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #298688 from kurnevsky/wesnoth118 

wesnoth: 1.16.11 -> 1.18.0
This commit is contained in:
Pol Dellaiera 2024-03-24 22:31:24 +01:00 committed by GitHub
parent 6cabef59b2 a5be355ddc
commit 091badaf0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/wesnoth/default.nix
View File

@ -1,26 +1,31 @@
{ 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
, lua, curl
, Cocoa, Foundation
}:
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.16.11";
version = "1.18.0";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
hash = "sha256-nnAMMc1pPYOziaHGUfh8LevECBb/lzCkaPyzFWs4zTY=";
hash = "sha256-Db1OwBTA/2jjhu/fOZhwGo7dWV3mZ40y6hTNCCjaRJQ=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
libvorbis fribidi dbus libpng pcre openssl icu ]
libvorbis fribidi dbus libpng pcre openssl icu lua curl ]
++ lib.optionals stdenv.isDarwin [ Cocoa Foundation];
cmakeFlags = [
"-DENABLE_SYSTEM_LUA=ON"
];
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
meta = with lib; {

6
pkgs/top-level/all-packages.nix
View File

@ -37858,6 +37858,12 @@ with pkgs;
wesnoth = callPackage ../games/wesnoth {
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
# wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
lua = lua5_4.override {
postConfigure = ''
makeFlagsArray+=("CC=$CXX")
'';
};
};
wesnoth-dev = wesnoth;