diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-03-09 16:33:18 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-03-13 17:33:05 +0100 |
| commit | 7da70c0b87e56375f24584c18faa10b95803c3c9 (patch) | |
| tree | f0fdd9d89aaf96c6cba219ce4a3cd5ebf9db376f /pkgs/games/freeorion | |
| parent | 90b394936b374be2be7da80ef04178f262dff848 (diff) | |
| download | nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar.gz nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar.bz2 nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar.lz nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar.xz nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.tar.zst nixpkgs-7da70c0b87e56375f24584c18faa10b95803c3c9.zip | |
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
Diffstat (limited to 'pkgs/games/freeorion')
| -rw-r--r-- | pkgs/games/freeorion/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
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 ]; |