From e3ef7979013dbc77a6f5abe8f76b201d3d97ab52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Nov 2014 13:33:08 +0100
Subject: [PATCH] Fix stdenv allowedRequisites check

It has to include the default build inputs now (like
"compress-man-pages.sh").
---
 pkgs/stdenv/generic/default.nix | 2 +-
 pkgs/stdenv/linux/default.nix   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index d59e8b6b94e..2d7a1301009 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -120,7 +120,7 @@ let
   # The stdenv that we are producing.
   result =
     derivation (
-    (if isNull allowedRequisites then {} else { inherit allowedRequisites; }) //
+    (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
     {
       inherit system name;
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 0467b60ca47..76849c2c61a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -287,7 +287,8 @@ rec {
     allowedRequisites = with stage4.pkgs;
       [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
-        paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv ];
+        paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv
+      ];
 
     overrides = pkgs: {
       inherit gcc;