diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:32:24 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-19 21:32:24 +0000 |
commit | ed19699d1fd853dc673b5babb9f2eabcf69fac06 (patch) | |
tree | aace132847a66cf47711088af595f36231502551 /pkgs/development | |
parent | 63abc2ed86acfc39022d7674ccee66663a3451b8 (diff) |
glibc/hurd: Make Mach & Hurd headers propagated build inputs.
svn path=/nixpkgs/trunk/; revision=21906
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/glibc-2.11/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix index 9ba106e74d413..a9d82e677b179 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; } |