Author: egorochkin
Date: Sun Nov 14 08:57:49 2010
New Revision: 24684
URL: https://svn.nixos.org/websvn/nix/?rev=24684&sc=1
Log:
Gemrb: replace the ugly workaround with a less ugly one.
Modified:
nixpkgs/trunk/pkgs/games/gemrb/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/games/gemrb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/gemrb/default.nix Sun Nov 14 08:57:42 2010
(r24683)
+++ nixpkgs/trunk/pkgs/games/gemrb/default.nix Sun Nov 14 08:57:49 2010
(r24684)
@@ -18,11 +18,6 @@
# 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/;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 14 08:57:42
2010 (r24683)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 14 08:57:49
2010 (r24684)
@@ -6565,7 +6565,9 @@
wxGTK = wxGTK28.override { unicode = false; };
};
- gemrb = callPackage ../games/gemrb { };
+ gemrb = callPackage ../games/gemrb {
+ stdenv = stdenv2;
+ };
gltron = callPackage ../games/gltron { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
