From 34b59c1867ce0af79a45a4e1cd5c3e32350f43e2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 May 2007 15:21:55 +0000
Subject: [PATCH] * Linux updated to 2.6.20.11. * Build the kernel with the new
 gcc wrapper so that LINUX_COMPILER   gets set properly (and in particular so
 that the kernel version   string doesn't show "(collect2: ld returned 1 exit
 status)").

svn path=/nixpkgs/trunk/; revision=8645
---
 pkgs/os-specific/linux/kernel/linux-2.6.20.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.20.nix b/pkgs/os-specific/linux/kernel/linux-2.6.20.nix
index bb6f5ce34c1..d839a7632fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.20.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.20.nix
@@ -16,7 +16,7 @@ let
 
   lib = import ../../../lib;
 
-  version = "2.6.20.7";
+  version = "2.6.20.11";
 
 in
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1a6flnnaaj11c7cgsr63ix5ln67wih3ffbv473dvsqb0c2rmwvw5";
+    sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
   };
   
   patches = map (p: p.patch) kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02141eb7cae..c92e01910c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2228,7 +2228,8 @@ rec {
   kernel = kernel_2_6_20;
 
   kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix {
-    inherit fetchurl stdenv perl mktemp module_init_tools;
+    inherit fetchurl perl mktemp module_init_tools;
+    stdenv = overrideGCC stdenv gccNew;
     kernelPatches = [
       { name = "skas-2.6.20-v9-pre9";
         patch = fetchurl {