diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
| commit | 674c51af3c0f3f1c65e1975893fdf6438bc57f28 (patch) | |
| tree | 3020861cf515bc567e191361357d42e11ac817ee /pkgs/games/eduke32/default.nix | |
| parent | da437144fa4f446e91b5f7f78b55faa4d12de58a (diff) | |
| parent | d742d26b0d8c7125fb29417fcb40e2665e10100d (diff) | |
| download | nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.gz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.bz2 nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.lz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.xz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.zst nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/games/eduke32/default.nix')
| -rw-r--r-- | pkgs/games/eduke32/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 6eab8acce751..b8a215e3b49c 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}: +{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}: stdenv.mkDerivation rec { - name = "eduke32-1944"; + name = "eduke32-3542"; src = fetchurl { - url = http://dukeworld.duke4.net/eduke32/synthesis/20110724-1944/eduke32_src_20110724-1944.tar.bz2; - sha256 = "0y2y9agydfkdq4krp4lz22br3p23as6hrqhq7l9djw0pm2y76fqh"; + url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; + sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc"; }; - buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig ] + buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; |