From 7185aefbbea55d8e196f9d9e7e4988aa802b3258 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 20 Mar 2016 15:17:50 +0300 Subject: [PATCH] ioquake3: 2016-02-18 -> 2016-03-15 --- pkgs/games/quake3/ioquake/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 8988c391824..3067b5cefea 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" ];