diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/by-name/we/wesnoth/package.nix similarity index 92% rename from pkgs/games/wesnoth/default.nix rename to pkgs/by-name/we/wesnoth/package.nix index 1db4ae430e28..a50355909457 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e39009dfeb3a..b68b2fe15612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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