wesnoth: move to pkgs/by-name
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
SDL2_ttf,
|
||||
pango,
|
||||
gettext,
|
||||
boost,
|
||||
boost186,
|
||||
libvorbis,
|
||||
fribidi,
|
||||
dbus,
|
||||
@@ -20,11 +20,21 @@
|
||||
pcre,
|
||||
openssl,
|
||||
icu,
|
||||
lua,
|
||||
lua5_4,
|
||||
curl,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
boost = boost186;
|
||||
# wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
|
||||
lua = lua5_4.override {
|
||||
postConfigure = ''
|
||||
makeFlagsArray+=("CC=$CXX")
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wesnoth";
|
||||
version = "1.18.5";
|
||||
@@ -13917,18 +13917,6 @@ with pkgs;
|
||||
|
||||
warsow = callPackage ../games/warsow { };
|
||||
|
||||
wesnoth = callPackage ../games/wesnoth {
|
||||
boost = boost186;
|
||||
# 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;
|
||||
|
||||
inherit (callPackage ../games/xonotic { })
|
||||
xonotic-data
|
||||
xonotic
|
||||
|
||||
Reference in New Issue
Block a user