diff options
| author | Milan Svoboda <milan.svoboda@centrum.cz> | 2018-09-02 21:42:47 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-02 21:42:47 +0200 |
| commit | ae76e51f86a9f0d9c677e90e992126dda8276629 (patch) | |
| tree | 5855dc78f49bea375860d403a68b7b9e339d8418 /pkgs/games/freeorion | |
| parent | a92cfb57256d05a76db6f58913270b92e198382c (diff) | |
FreeOrion 0.4.7.1 -> 0.4.8 (#45943)
Diffstat (limited to 'pkgs/games/freeorion')
| -rw-r--r-- | pkgs/games/freeorion/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/games/freeorion/fix-paths.sh | 4 | ||||
| -rw-r--r-- | pkgs/games/freeorion/fix_rpaths.patch | 11 |
3 files changed, 11 insertions, 24 deletions
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 011812580e71..a9ebd994bb88 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -4,29 +4,25 @@ }: stdenv.mkDerivation rec { - version = "0.4.7.1"; + version = "0.4.8"; name = "freeorion-${version}"; src = fetchFromGitHub { owner = "freeorion"; repo = "freeorion"; - rev = "v${version}"; - sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; + rev = "v${version}"; + sha256 = "1lj1q2ljjgbbiqxb53wdrrcz0zxxr3vv9jqrhbzvfsss7q808jfw"; }; - buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ]; + buildInputs = [ + (boost.override { enablePython = true; }) + SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; enableParallelBuilding = true; patches = [ - # fix build with boost 1.66 - (fetchpatch { - url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch; - sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94"; - }) - ./fix_rpaths.patch ]; postInstall = '' @@ -41,7 +37,8 @@ stdenv.mkDerivation rec { chmod +x $out/fixpaths/fix-paths wrapProgram $out/bin/freeorion \ - --run $out/fixpaths/fix-paths + --run $out/fixpaths/fix-paths \ + --prefix LD_LIBRARY_PATH : $out/lib/freeorion ''; meta = with stdenv.lib; { @@ -49,5 +46,6 @@ stdenv.mkDerivation rec { homepage = http://www.freeorion.org; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; + maintainers = with maintainers; [ tex ]; }; } diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh index cd6f381de255..73a3bd6feda9 100644 --- a/pkgs/games/freeorion/fix-paths.sh +++ b/pkgs/games/freeorion/fix-paths.sh @@ -1,6 +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 +if [ -e ~/.config/freeorion/config.xml ]; then + @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml fi exit 0 diff --git a/pkgs/games/freeorion/fix_rpaths.patch b/pkgs/games/freeorion/fix_rpaths.patch deleted file mode 100644 index f53e9821e5dd..000000000000 --- a/pkgs/games/freeorion/fix_rpaths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,7 @@ - set(FreeOrion_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/freeorion") - endif() - --set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${FreeOrion_INSTALL_LIBDIR}") -+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}/freeorion") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - if (WIN32) |