mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-19 20:09:01 +02:00
wesnoth: 1.16.11 -> 1.18.0
This commit is contained in:
parent
c95e47775f
commit
a5be355ddc
|
@ -1,26 +1,31 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
|
, cmake, pkg-config, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
|
||||||
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
|
, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
|
||||||
|
, lua, curl
|
||||||
, Cocoa, Foundation
|
, Cocoa, Foundation
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wesnoth";
|
pname = "wesnoth";
|
||||||
version = "1.16.11";
|
version = "1.18.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = version;
|
rev = version;
|
||||||
owner = "wesnoth";
|
owner = "wesnoth";
|
||||||
repo = "wesnoth";
|
repo = "wesnoth";
|
||||||
hash = "sha256-nnAMMc1pPYOziaHGUfh8LevECBb/lzCkaPyzFWs4zTY=";
|
hash = "sha256-Db1OwBTA/2jjhu/fOZhwGo7dWV3mZ40y6hTNCCjaRJQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
|
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];
|
++ lib.optionals stdenv.isDarwin [ Cocoa Foundation];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DENABLE_SYSTEM_LUA=ON"
|
||||||
|
];
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
|
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -37839,6 +37839,12 @@ with pkgs;
|
||||||
|
|
||||||
wesnoth = callPackage ../games/wesnoth {
|
wesnoth = callPackage ../games/wesnoth {
|
||||||
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
|
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;
|
wesnoth-dev = wesnoth;
|
||||||
|
|
Loading…
Reference in a new issue