diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-13 17:55:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 17:55:08 +0000 |
| commit | 134af4c5ac81992b8541c5076489a9fc3807ba32 (patch) | |
| tree | dbfe8db48780638097426d2d27ac673d8dca37cb /pkgs/games | |
| parent | 2381bcd86f3bc79fffc025ffd99ea75ae5a9b7b5 (diff) | |
| parent | 7da70c0b87e56375f24584c18faa10b95803c3c9 (diff) | |
| download | nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar.gz nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar.bz2 nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar.lz nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar.xz nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.tar.zst nixlib-134af4c5ac81992b8541c5076489a9fc3807ba32.zip | |
Merge pull request #36659 from Ma27/fix-freeorion
freeorion: fix build
Diffstat (limited to 'pkgs/games')
| -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 3d7e132e6122..011812580e71 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 ]; |