From 034b07e6ffc586e766086da212c60ac1a877a744 Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sun, 14 Sep 2014 19:32:58 +0200
Subject: [PATCH] Remove gcc and zlib dependency on bootstrap-tools

The 82797f98f2917e164db8691b516ed7f354b40ff4 merge caused this
issue while trying to merge the staging refactorings with
the modular-stdenv feature branch.
---
 pkgs/stdenv/linux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 8caadec38917..5856399c42b6 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -85,6 +85,7 @@ rec {
 
       thisStdenv = import ../generic {
         inherit system config;
+        extraBuildInputs = extraPath;
         name = "stdenv-linux-boot";
         preHook =
           ''
@@ -94,7 +95,7 @@ rec {
             ${commonPreHook}
           '';
         shell = "${bootstrapTools}/bin/sh";
-        initialPath = [bootstrapTools] ++ extraPath;
+        initialPath = [bootstrapTools];
         fetchurlBoot = import ../../build-support/fetchurl {
           stdenv = stage0.stdenv;
           curl = bootstrapTools;