* Build ‘xz’ during the stdenvNative bootstrap, since we really can't

  rely on it being present.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31707

1 files changed, 7 insertions, 6 deletions

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 3319a0d9271..28f077aa8ef 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -83,7 +83,7 @@ rec {
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).  
   makeStdenv =
-    {gcc, fetchurl, extraPath ? []}:
+    { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }:
 
     import ../generic {
       name = "stdenv-native";
@@ -100,7 +100,7 @@ rec {
 
       fetchurlBoot = fetchurl;
 
-      inherit system shell gcc;
+      inherit system shell gcc overrides;
     };
 
 
@@ -137,12 +137,13 @@ rec {
   };
 
 
-  # Using that, build a stdenv that adds the `replace' command (which
-  # most systems don't have, so we mustn't rely on the native
-  # environment providing it).
+  # Using that, build a stdenv that adds the ‘xz’ command (which most
+  # systems don't have, so we mustn't rely on the native environment
+  # providing it).
   stdenvBoot2 = makeStdenv {
     inherit gcc fetchurl;
-    extraPath = [stdenvBoot1Pkgs.replace];
+    extraPath = [ stdenvBoot1Pkgs.xz ];
+    overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; };
   };