From aa17cbf0a8b39e040d3e04198d3c4266100ceadc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2014 10:38:48 +0100 Subject: [PATCH] Remove unnecessary override --- pkgs/games/quake3/game/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index bea117c04197..cbcc8c290f81 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, gcc }: +{ lib, stdenv, fetchurl, x11, SDL, mesa, openal, gcc46 }: stdenv.mkDerivation { name = "ioquake3-1.36"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ./exit.patch ]; - buildInputs = [x11 SDL mesa openal gcc]; + buildInputs = [ x11 SDL mesa openal gcc46 ]; # 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 244c236bb17c..97b96e9b26cc 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 { gcc = gcc46; }; + quake3game = callPackage ../games/quake3/game { }; quantumminigolf = callPackage ../games/quantumminigolf {};