diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-03 17:25:24 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-03 17:25:24 +0000 |
| commit | 2bca92e32dc0d5a315c2c82557704eda6fe30f08 (patch) | |
| tree | 0bcdc5ba0a11d3a8178a6e7e703a905d2fd7ba42 /pkgs/games | |
| parent | 08761e83fcdcf87877109f627a93ea9ebb2fc310 (diff) | |
| parent | 71c6de7338c98e2363c72456aa9708f92b8cdfd6 (diff) | |
| download | nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar.gz nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar.bz2 nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar.lz nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar.xz nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.tar.zst nixlib-2bca92e32dc0d5a315c2c82557704eda6fe30f08.zip | |
Merge trunk
Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/naev/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index abafd7eb36dc..f6e571404d6e 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,25 +1,33 @@ -{ fetchurl, stdenv, lua5, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, mesa, makeWrapper }: +{ fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis +, libpng, mesa, makeWrapper, zlib }: +let + pname = "naev"; + version = "0.5.0"; + name = "${pname}-${version}"; +in stdenv.mkDerivation { - name = "naev-0.5.0beta1"; + inherit name; srcData = fetchurl { - url = http://naev.googlecode.com/files/ndata-0.5.0-beta1; - sha256 = "0pqys1wdlxa336i9gjxfkgnq42xrbvq58ym66y0aa9xm92vr53f6"; + url = "mirror://sourceforge/naev/ndata-${version}"; + sha256 = "0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6"; }; src = fetchurl { - url = http://naev.googlecode.com/files/naev-0.5.0-beta1.tar.bz2; - sha256 = "1nkwjclfjypgdcfbfqkiidsvi0zfjvkcj0dgnrbj1g11rr6kd3wm"; + url = "mirror://sourceforge/naev/${name}.tar.bz2"; + sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL lua5 SDL_mixer openal libxml2 pkgconfig libvorbis - libpng mesa makeWrapper ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ]; + + buildNativeInputs = [ pkgconfig makeWrapper ]; + + NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; postInstall = '' ensureDir $out/share/naev - cp $srcData $out/share/naev/ndata + cp -v $srcData $out/share/naev/ndata wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata ''; |