mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
wesnoth: 1.16.11 -> 1.18.0
This commit is contained in:
parent
c95e47775f
commit
a5be355ddc
@ -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; {
|
||||
|
@ -37839,6 +37839,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;
|
||||
|
Loading…
Reference in New Issue
Block a user