From 0f79534aa72807c86c96604e875a50ab2f997401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 9 Feb 2014 23:52:59 +0100 Subject: [PATCH] spring: use wrapper to set gcc lib path --- pkgs/games/spring/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index b073aa3488bf..9de55a24312b 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip, glibc +{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils -, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl +, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" - "-DPREFER_STATIC_LIBS=OFF"]; + "-DPREFER_STATIC_LIBS:BOOL=OFF"]; - buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL glibc - xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl + buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL stdenv.glibc + xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { # reported upstream http://springrts.com/mantis/view.php?id=4305 #enableParallelBuilding = true; # occasionally missing generated files on Hydra + postInstall = '' + wrapProgram "$out/bin/spring" \ + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib" + ''; + meta = with stdenv.lib; { homepage = http://springrts.com/; description = "A powerful real-time strategy (RTS) game engine";