diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-20 15:17:50 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-20 17:07:31 +0300 |
| commit | 7185aefbbea55d8e196f9d9e7e4988aa802b3258 (patch) | |
| tree | 54410daf492051635ca50a2159b3cdd51e249a8f /pkgs/games/quake3 | |
| parent | b405e82edb4cb00a191839ad8208748189767f9d (diff) | |
| download | nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar.gz nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar.bz2 nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar.lz nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar.xz nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.tar.zst nixlib-7185aefbbea55d8e196f9d9e7e4988aa802b3258.zip | |
ioquake3: 2016-02-18 -> 2016-03-15
Diffstat (limited to 'pkgs/games/quake3')
| -rw-r--r-- | pkgs/games/quake3/ioquake/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 8988c391824a..3067b5cefead 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper, SDL2, mesa, openalSoft +{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft , curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2016-02-18"; + version = "2016-03-15"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "a331637745fb82266f3627fb438f2d58d53e366c"; - sha256 = "0l9ppv1msd73bhqmdiv5lsvkr5i6khqgi6gi322gbnndr20arn4n"; + rev = "f911e32bb059f714dfc49dc2296bc6f27c442e4c"; + sha256 = "0l60snxlgvwxbpv31nwshy0rddyyxmcvqg6xqj9ifzr1gj4np5r8"; }; + nativeBuildInputs = [ which pkgconfig ]; buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" "-I${opusfile}/include/opus" "-I${libopus}/include/opus" ]; - NIX_CFLAGS_LINK = [ "-lSDL2" ]; - enableParallelBuilding = true; makeFlags = [ "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_OPENAL_DLOPEN=0" "USE_CURL_DLOPEN=0" ]; |