JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36659 from Ma27/fix-freeorion

Browse Source 
freeorion: fix build
This commit is contained in:
Franz Pletz 2018-03-13 17:55:08 +00:00 committed by GitHub
commit 134af4c5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/freeorion/default.nix
View File

@ -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
];