Author: eelco
Date: Sun Aug 1 14:24:46 2010
New Revision: 22837
URL: https://svn.nixos.org/websvn/nix/?rev=22837&sc=1
Log:
* GemRB updated to 0.6.1.
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 Sat Jul 31 18:47:15 2010
(r22836)
+++ nixpkgs/trunk/pkgs/games/gemrb/default.nix Sun Aug 1 14:24:46 2010
(r22837)
@@ -1,16 +1,25 @@
-{stdenv, fetchurl, SDL, openal, freealut, zlib, libpng, python}:
+{ stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }:
-stdenv.mkDerivation {
- name = "gemrb-0.2.9";
+stdenv.mkDerivation rec {
+ name = "gemrb-0.6.1";
src = fetchurl {
- url = mirror://sourceforge/gemrb/gemrb-0.2.9.tar.gz;
- sha256 = "0mygig4icx87a5skdv33yiwn8q4mv55f5qsks4sn40hrs69gcih0";
+ url = "mirror://sourceforge/gemrb/${name}.tar.gz";
+ sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93";
};
- buildInputs = [SDL openal freealut libpng python];
+ buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];
- configureFlags = "--with-zlib=${zlib}";
+ # Necessary to find libdl.
+ CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib";
+
+ # 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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jul 31 18:47:15
2010 (r22836)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 1 14:24:46
2010 (r22837)
@@ -9307,7 +9307,7 @@
};
gemrb = import ../games/gemrb {
- inherit fetchurl stdenv SDL openal freealut zlib libpng python;
+ inherit fetchurl stdenv cmake SDL openal zlib libpng python libvorbis;
};
gltron = import ../games/gltron {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
