Unverified Commit f4514691 authored by Niklas Korz's avatar Niklas Korz Committed by GitHub
Browse files

wesnoth: move to pkgs/by-name, add maintainer (#447802)

parents 63107772 8c34dffa

pkgs/games/wesnoth/default.nix→pkgs/by-name/we/wesnoth/package.nix

+13 −2
Original line number Diff line number Diff line
@@ -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";
@@ -118,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [

      niklaskorz

      iedame

    ];

    platforms = lib.platforms.unix;

    mainProgram = "wesnoth";

pkgs/top-level/all-packages.nix

+0 −12
Original line number Diff line number Diff line
@@ -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