From 4ac4af08f29ff4ba1b62de190d871ec9d402f51f Mon Sep 17 00:00:00 2001
From: Gergely Risko <errge@nilcons.com>
Date: Sun, 14 Sep 2014 19:37:32 +0200
Subject: [PATCH] Cosmetic renaming: extraPath -> extraBuildInputs

---
 pkgs/stdenv/linux/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 5856399c42b..d97c613be7b 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -79,13 +79,12 @@ rec {
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun =
-    {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
+    {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraBuildInputs ? []}:
 
     let
 
       thisStdenv = import ../generic {
-        inherit system config;
-        extraBuildInputs = extraPath;
+        inherit system config extraBuildInputs;
         name = "stdenv-linux-boot";
         preHook =
           ''
@@ -207,7 +206,7 @@ rec {
     extraAttrs = {
       glibc = stage2.pkgs.glibc;  # Required by gcc47 build
     };
-    extraPath = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
+    extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
   };
 
 
@@ -221,10 +220,10 @@ rec {
       coreutils = bootstrapTools;
       name = "";
     };
-    extraPath = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
     overrides = pkgs: {
       inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;
     };
+    extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
   };