diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-19 03:09:46 +0400 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-19 03:09:46 +0400 |
commit | 05e713e7a543d030d905863697e35aac6bb31bc7 (patch) | |
tree | a85b740f7ae09f60abc0d2cf5e16b8d688913ea2 | |
parent | 21b54a9b971b6bf9315eb37138f869b5f43d1478 (diff) | |
parent | d8eec18ce20ae7b0dde087937d4daf78b9619748 (diff) | |
download | nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar.gz nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar.bz2 nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar.lz nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar.xz nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.tar.zst nixlib-05e713e7a543d030d905863697e35aac6bb31bc7.zip |
Merge pull request #14775 from rardiol/freeorion
freeorion: init at 0.4.5
-rw-r--r-- | pkgs/games/freeorion/92455f9.patch | 19 | ||||
-rw-r--r-- | pkgs/games/freeorion/default.nix | 41 | ||||
-rw-r--r-- | pkgs/games/freeorion/fix-paths.sh | 6 | ||||
-rw-r--r-- | pkgs/games/freeorion/fix-paths.xslt | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 81 insertions, 0 deletions
diff --git a/pkgs/games/freeorion/92455f9.patch b/pkgs/games/freeorion/92455f9.patch new file mode 100644 index 000000000000..e40ee78de6df --- /dev/null +++ b/pkgs/games/freeorion/92455f9.patch @@ -0,0 +1,19 @@ +diff -Naur GG/src/Font.cpp +--- /GG/src/Font.cpp ++++ /GG/src/Font.cpp +@@ -1586,8 +1586,13 @@ + using boost::lexical_cast; + FT_UInt index = FT_Get_Char_Index(face, ch); + if (index) { +- if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) +- ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch); ++ if (FT_Load_Glyph(face, index, FT_LOAD_DEFAULT)) { ++ // loading of a glpyh failed so we replace it with ++ // the 'Replacement Character' at codepoint 0xFFFD ++ FT_UInt tmp_index = FT_Get_Char_Index(face, 0xFFFD); ++ if (FT_Load_Glyph(face, tmp_index, FT_LOAD_DEFAULT)) ++ ThrowBadGlyph("GG::Font::GetGlyphBitmap : Freetype could not load the glyph for character '%1%'", ch); ++ } + + FT_GlyphSlot glyph = face->glyph; + diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix new file mode 100644 index 000000000000..e143b6ebcf31 --- /dev/null +++ b/pkgs/games/freeorion/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, doxygen +, libxslt, makeWrapper }: + +stdenv.mkDerivation rec { + version = "0.4.5"; + name = "freeorion-${version}"; + + src = fetchurl { + url = "https://github.com/freeorion/freeorion/releases/download/v0.4.5/FreeOrion_v0.4.5_2015-09-01.f203162_Source.tar.gz"; + sha256 = "3b99b92eeac72bd059566dbabfab54368989ba83f72e769bc94eb8dd4fe414c0"; + }; + + buildInputs = [ cmake boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew doxygen makeWrapper ]; + + # cherry pick for acceptable performance https://github.com/freeorion/freeorion/commit/92455f97c28055e296718230d2e3744eccd738ec + patches = [ ./92455f9.patch ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/fixpaths + # We need final slashes for XSLT replace to work properly + substitute ${./fix-paths.xslt} $out/fixpaths/fix-paths.xslt \ + --subst-var-by nixStore "$NIX_STORE/" \ + --subst-var-by out "$out/" + substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \ + --subst-var-by libxsltBin ${libxslt.bin} \ + --subst-var out + chmod +x $out/fixpaths/fix-paths + + wrapProgram $out/bin/freeorion \ + --run $out/fixpaths/fix-paths + ''; + + 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 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh new file mode 100644 index 000000000000..cd6f381de255 --- /dev/null +++ b/pkgs/games/freeorion/fix-paths.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -e ~/.freeorion/config.xml ]; then + @libxsltBin@/bin/xsltproc -o ~/.freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.freeorion/config.xml +fi +exit 0 diff --git a/pkgs/games/freeorion/fix-paths.xslt b/pkgs/games/freeorion/fix-paths.xslt new file mode 100644 index 000000000000..f0db646b81ad --- /dev/null +++ b/pkgs/games/freeorion/fix-paths.xslt @@ -0,0 +1,13 @@ +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:output method="xml" omit-xml-declaration="no" indent="yes" /> + + <xsl:template match='node() | @*'> + <xsl:copy> + <xsl:apply-templates select='node() | @*'/> + </xsl:copy> + </xsl:template> + + <xsl:template match='//text()[starts-with(., "@nixStore@")]'> + <xsl:value-of select='concat("@out@", substring-after(substring-after(., "@nixStore@"), "/"))'/> + </xsl:template> +</xsl:stylesheet> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd70f1231ad..632468903e98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14771,6 +14771,8 @@ in freedink = callPackage ../games/freedink { }; + freeorion = callPackage ../games/freeorion { }; + fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; }; }; |