From ed19699d1fd853dc673b5babb9f2eabcf69fac06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 19 May 2010 21:32:24 +0000
Subject: [PATCH] glibc/hurd: Make Mach & Hurd headers propagated build inputs.

svn path=/nixpkgs/trunk/; revision=21906
---
 pkgs/development/libraries/glibc-2.11/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix
index 9ba106e74d4..a9d82e677b1 100644
--- a/pkgs/development/libraries/glibc-2.11/default.nix
+++ b/pkgs/development/libraries/glibc-2.11/default.nix
@@ -39,9 +39,18 @@ in
   //
 
   (if hurdHeaders != null
-   then {
+   then rec {
      inherit machHeaders hurdHeaders mig fetchgit;
 
+     propagatedBuildInputs = [ machHeaders hurdHeaders ];
+
+     passthru = {
+       # When building GCC itself `propagatedBuildInputs' above is not
+       # honored, so we pass it here so that the GCC builder can do the right
+       # thing.
+       inherit propagatedBuildInputs;
+     };
+
      # XXX: Remove this hack in `stdenv-updates'.
      builder = ./builder2.sh;
    }