diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:29:21 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:29:21 +0000 |
| commit | e64443baf1f78b62ebd4db5354b348bd3a280c01 (patch) | |
| tree | c2522ae7385a177ae5c9bb87d7e7dd5c7790fcbc /pkgs/games | |
| parent | 9a48e47d600354b6e115f6511087cc1ffe82fb57 (diff) | |
| parent | fb12a6838f1fda1d6ace53d0d97a548a1e427ced (diff) | |
| download | nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar.gz nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar.bz2 nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar.lz nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar.xz nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.tar.zst nixlib-e64443baf1f78b62ebd4db5354b348bd3a280c01.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/andyetitmoves/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/vdrift/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 0b54e8286095..6234d3702f7c 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4"; } else - abort "And Yet It Moves nix package only supports linux and intel cpu's."; + throw "And Yet It Moves nix package only supports linux and intel cpu's."; phases = "unpackPhase installPhase"; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 586bfc3e511d..0f9da8883827 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis, - asio, boost, SDL_gfx }: + asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }: stdenv.mkDerivation rec { - name = "vdrift-2010-06-30"; + name = "vdrift-2011-10-22"; src = fetchurl { url = "mirror://sourceforge/vdrift/${name}.tar.bz2"; - sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j"; + sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s"; }; buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost - SDL_gfx ]; + SDL_gfx pkgconfig bullet curl libarchive ]; buildPhase = '' sed -i -e s,/usr/local,$out, SConstruct |