Gemrb: replace the ugly workaround with a less ugly one.

svn path=/nixpkgs/trunk/; revision=24684
This commit is contained in:
Evgeny Egorochkin 2010-11-14 08:57:49 +00:00
parent 6748294477
commit 2e516fab70
2 changed files with 3 additions and 6 deletions

View File

@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
# Can't have -werror because of the Vorbis header files.
cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
# !!! Ugly. CMake passes library dependencies to the linker using
# the full path of the library rather than `-l...', and the
# ld-wrapper doesn't add the necessary `-rpath' flag.
NIX_LDFLAGS = "-rpath ${zlib}/lib -rpath ${libpng}/lib -rpath ${python}/lib -rpath ${openal}/lib -rpath ${SDL}/lib -rpath ${libvorbis}/lib";
meta = {
description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
homepage = http://gemrb.sourceforge.net/;

View File

@ -6565,7 +6565,9 @@ let
wxGTK = wxGTK28.override { unicode = false; };
};
gemrb = callPackage ../games/gemrb { };
gemrb = callPackage ../games/gemrb {
stdenv = stdenv2;
};
gltron = callPackage ../games/gltron { };