diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-12-06 16:13:50 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-12-06 16:50:42 +0800 |
commit | acab619ba0ea824824a00a70bf98cee95a5d42e4 (patch) | |
tree | 74f55375b9849e2be614cebb45a3beac032bd0d1 /pkgs/games/freeorion | |
parent | fb1660439b895a36f9a4c05374dc643c28a83be2 (diff) |
freeorion: 0.4.6 -> 0.4.7.1
Also compile against latest boost.
Diffstat (limited to 'pkgs/games/freeorion')
-rw-r--r-- | pkgs/games/freeorion/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 438b01fe51ac..61a1aed8178f 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, cmake, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, doxygen -, libxslt, makeWrapper }: +{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, libxslt }: stdenv.mkDerivation rec { - version = "0.4.6"; + version = "0.4.7.1"; name = "freeorion-${version}"; - src = fetchurl { - url = "https://github.com/freeorion/freeorion/releases/download/v0.4.6/FreeOrion_v0.4.6_2016-09-16.49f9123_Source.tar.gz"; - sha256 = "04g3x1cymf7mnmc2f5mm3c2r5izjmy7z3pvk2ykzz8f8b2kz6gry"; + src = fetchFromGitHub { + owner = "freeorion"; + repo = "freeorion"; + rev = "v${version}"; + sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; }; - buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ]; + buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew ]; + + nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; + + enableParallelBuilding = true; patches = [ ./fix_rpaths.patch ]; - enableParallelBuilding = true; - postInstall = '' mkdir -p $out/fixpaths # We need final slashes for XSLT replace to work properly @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; homepage = http://www.freeorion.org; - license = [ licenses.gpl2 licenses.cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; }; } |