From 43be15a89cb70530a4843a1dda8a1fb5a90dc5dc Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Tue, 11 Nov 2014 09:34:40 +0100 Subject: fix quake3game build --- pkgs/games/quake3/game/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index d73c8c6a4c47..bea117c04197 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, x11, SDL, mesa, openal }: +{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./exit.patch ]; - buildInputs = [x11 SDL mesa openal]; + buildInputs = [x11 SDL mesa openal gcc]; # Fix building on GCC 4.6. NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97b96e9b26cc..244c236bb17c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11457,7 +11457,7 @@ let quake3demodata = callPackage ../games/quake3/demo { }; - quake3game = callPackage ../games/quake3/game { }; + quake3game = callPackage ../games/quake3/game { gcc = gcc46; }; quantumminigolf = callPackage ../games/quantumminigolf {}; -- cgit 1.4.1