Unverified Commit f585e482 authored by Emily's avatar Emily Committed by GitHub
Browse files

wesnoth: 1.18.2 -> 1.18.3; Revert "wesnoth: pin to boost183 to restore the build" (#370612)

parents fcc6f721 9c163546

pkgs/games/wesnoth/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


stdenv.mkDerivation rec {

  pname = "wesnoth";

  version = "1.18.2";

  version = "1.18.3";



  src = fetchFromGitHub {

    rev = version;

    owner = "wesnoth";

    repo = "wesnoth";

    hash = "sha256-nr+WUFzHeaPxCzwc+8JZRL86X8XEsnsGM1HXnNqOIF0=";

    hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -16907,8 +16907,6 @@ with pkgs; 














  wesnoth = callPackage ../games/wesnoth {















    inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;













    # fails to build against latest boost













    boost = boost183;















    # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234















    lua = lua5_4.override {















      postConfigure = ''