From 7da70c0b87e56375f24584c18faa10b95803c3c9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 9 Mar 2018 16:33:18 +0100 Subject: freeorion: fix build `boost::system::posix_error` is deprecated since v1.37, however the default Boost version in NixOS is 1.66. The following upstream patch fixed the issue: https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95 See ticket #36453 --- pkgs/games/freeorion/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 3d7e132e612..011812580e7 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper -, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, libGLU_combined, glew, libxslt }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, graphviz, makeWrapper +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff +, libjpeg, libGLU_combined, glew, libxslt +}: stdenv.mkDerivation rec { version = "0.4.7.1"; @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ + # fix build with boost 1.66 + (fetchpatch { + url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch; + sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94"; + }) ./fix_rpaths.patch ]; -- cgit 1.4.1