From d30ede1a13642bffce7643f8f32be5c58f8b4f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 14 Jun 2010 21:40:11 +0000
Subject: [PATCH] Reverting r22258. I got confused; we don't need a new gcc
 build in stdenvLinux, but an up to date ppl package (because the current does
 not build with such a new gmp)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22267
---
 pkgs/stdenv/linux/default.nix | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2a58a9de0cf..dd5647bec45 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -132,11 +132,6 @@ rec {
       stdenv = stdenvLinuxBoot0;
     };
 
-  # Helper function to override the compiler in stdenv for specific packages.
-  overrideGCC = stdenv: gcc: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
-    };
-
 
   # Create the first "real" standard environment.  This one consists
   # of bootstrap tools only, and a minimal Glibc to keep the GCC
@@ -185,17 +180,6 @@ rec {
   stdenvLinuxBoot2Pkgs = allPackages {
     inherit system;
     bootStdenv = stdenvLinuxBoot2;
-    config = {
-      packageOverrides = pkgs : {
-        # The stdenv's gcc will not be built with 'ppl'
-        # but the resulting 'gcc' attribute of these pkgs will.
-        # (that allows bootstrapping from bootstrapTools with old gmp)
-        stdenv = overrideGCC pkgs.stdenv (pkgs.wrapGCC (pkgs.gcc.gcc.override {
-          ppl = null;
-          cloogppl = null;
-        }));
-      };
-    };
   };