From 280ff9628244fd4ccb2aa34a8894378c9df742c0 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 25 Jun 2006 00:53:34 +0000
Subject: [PATCH] * build kernel with gcc 4.1.1 * let dietlibc use gcc 3.4.6,
 so e2fsprogs 1.36 can at least compile with it (errors with gcc 4, which are
 warnings with 3.4 and weird errors with e2fsprogs 1.38 and 1.39)

svn path=/nixpkgs/trunk/; revision=5527
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffc8402d997..e1fcb7cd4ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -570,10 +570,11 @@ rec {
     nativeGlibc = false;
     gcc = (import ../os-specific/linux/dietlibc-wrapper) {
       inherit stdenv dietlibc;
-      gcc = stdenv.gcc;
+      #gcc = stdenv.gcc;
+      gcc = gcc34;
     };
     #inherit (stdenv.gcc) binutils glibc;
-    inherit (stdenv.gcc) binutils;
+    inherit (gcc34) binutils;
     glibc = dietlibc;
     inherit stdenv;
   };
@@ -1837,8 +1838,7 @@ rec {
   };
 
   kernel = (import ../os-specific/linux/kernel) {
-    inherit fetchurl perl mktemp;
-    stdenv = overrideGCC stdenv gcc34;
+    inherit fetchurl perl mktemp stdenv;
   };
 
   #klibc = (import ../os-specific/linux/klibc) {