From 030af0a8035ba60f34d5b2020c9c020df769ecdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 15:48:17 +0200
Subject: [PATCH] fix .xz in stdenv bootstrap

Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
---
 pkgs/tools/compression/gzip/default.nix | 4 +++-
 pkgs/tools/misc/coreutils/default.nix   | 4 ++--
 pkgs/tools/text/diffutils/default.nix   | 4 ++--
 pkgs/tools/text/gawk/default.nix        | 6 +++---
 pkgs/tools/text/gnugrep/default.nix     | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 2b051099b390..53c71346fc14 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   name = "gzip-1.6";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildInputs = [ xz.bin ];
+
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
   makeFlags = "SHELL=/bin/sh GREP=grep";
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 47757e4659ac..4dbaa02555c3 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gmp ? null
+{ stdenv, fetchurl, perl, xz, gmp ? null
 , aclSupport ? false, acl ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
 }:
@@ -22,7 +22,7 @@ let
 
     outputs = [ "out" "info" ];
 
-    nativeBuildInputs = [ perl ];
+    nativeBuildInputs = [ perl xz.bin ];
     buildInputs = [ gmp ]
       ++ optional aclSupport acl
       ++ optionals selinuxSupport [ libselinux libsepol ];
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 680a75445ef0..70a3bdeb7984 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coreutils ? null }:
+{ stdenv, fetchurl, xz, coreutils ? null }:
 
 stdenv.mkDerivation rec {
   name = "diffutils-3.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ];
 
   /* If no explicit coreutils is given, use the one from stdenv. */
-  nativeBuildInputs = [ coreutils ];
+  nativeBuildInputs = [ xz.bin coreutils ];
 
   meta = {
     homepage = http://www.gnu.org/software/diffutils/diffutils.html;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f5fbf029aad0..60cb8592589e 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsigsegv, readline, interactive ? false }:
+{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false }:
 
 let
   inherit (stdenv.lib) optional;
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   # When we do build separate interactive version, it makes sense to always include docs.
-  #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
+  outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
 
-  buildInputs = [ libsigsegv ]
+  buildInputs = [ xz.bin libsigsegv ]
     ++ optional interactive readline;
 
   configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index d0c5b8dbd215..2c5c54ddec78 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre, libiconv ? null }:
+{ stdenv, fetchurl, xz, pcre, libiconv ? null }:
 
 let version = "2.14"; in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   #outputs = [ "out" "doc" ]; ToDo
 
-  buildInputs = [ pcre ]
+  buildInputs = [ pcre xz.bin ]
     ++ stdenv.lib.optional (libiconv != null) libiconv;
 
   patches = [ ./test-localeconv.patch ];