diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-01 14:24:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-01 14:24:46 +0000 |
| commit | 283005d568e7c96a33956f49238971093700c09f (patch) | |
| tree | b65509bb3775762c2ce7d4c7bc69bf3316b22d49 /pkgs | |
| parent | 3cae107ccad3bed0f08c6b01dec9c58486216f27 (diff) | |
| download | nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar.gz nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar.bz2 nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar.lz nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar.xz nixpkgs-283005d568e7c96a33956f49238971093700c09f.tar.zst nixpkgs-283005d568e7c96a33956f49238971093700c09f.zip | |
* GemRB updated to 0.6.1.
svn path=/nixpkgs/trunk/; revision=22837
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/gemrb/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index aaccc8b5171..f3f50a66240 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7576a0ce27..7a1914ca0d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9307,7 +9307,7 @@ let }; 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 { |