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

FreeOrion 0.4.7.1 -> 0.4.8 (#45943)

Browse Source
This commit is contained in:
Milan Svoboda 2018-09-02 21:42:47 +02:00 committed by xeji
parent a92cfb5725
commit ae76e51f86
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,29 +4,25 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.4.7.1"; version = "0.4.8";
name = "freeorion-${version}"; name = "freeorion-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "freeorion"; owner = "freeorion";
repo = "freeorion"; repo = "freeorion";
rev = "v${version}"; rev = "v${version}";
sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; 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 ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ patches = [
# fix build with boost 1.66
(fetchpatch {
url = https://github.com/freeorion/freeorion/commit/c9b5b13fb81b1ed142dee0e843101c6b8832ca95.patch;
sha256 = "0agqhxk8462sgd230lmdzbrbrfd77zyy7a4g8hrf28zxza1nza94";
})
./fix_rpaths.patch
]; ];
postInstall = '' postInstall = ''
@ -41,7 +37,8 @@ stdenv.mkDerivation rec {
chmod +x $out/fixpaths/fix-paths chmod +x $out/fixpaths/fix-paths
wrapProgram $out/bin/freeorion \ 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; { meta = with stdenv.lib; {
@ -49,5 +46,6 @@ stdenv.mkDerivation rec {
homepage = http://www.freeorion.org; homepage = http://www.freeorion.org;
license = with licenses; [ gpl2 cc-by-sa-30 ]; license = with licenses; [ gpl2 cc-by-sa-30 ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ tex ];
}; };
} }

4
pkgs/games/freeorion/fix-paths.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if [ -e ~/.freeorion/config.xml ]; then if [ -e ~/.config/freeorion/config.xml ]; then
@libxsltBin@/bin/xsltproc -o ~/.freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.freeorion/config.xml @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml
fi fi
exit 0 exit 0

11
pkgs/games/freeorion/fix_rpaths.patch
View File

@ -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)