diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 12:10:28 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 12:10:28 +0100 |
| commit | 1014620bcec75f07ee8836f517cf6aa7dd66b4c3 (patch) | |
| tree | 935893cec728df06d156544d4c5f3a0ce6e34aaf /pkgs/stdenv/generic/setup.sh | |
| parent | 8e9e4b05f76bc0f9af6e0554ca15b81ea63fa598 (diff) | |
| download | nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar.gz nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar.bz2 nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar.lz nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar.xz nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.tar.zst nixlib-1014620bcec75f07ee8836f517cf6aa7dd66b4c3.zip | |
stdenv: Statically include the default build inputs
Otherwise, stdenv won't have a reference to e.g. patchelf on Linux (because it was passed in by mkDerivation). This causes the installer tests to fail, because having "stdenv" in the installation CD closure is not enough to pull in all stdenv packages. http://hydra.nixos.org/build/16546643
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 864a519157c3..904cc13e06c7 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -220,12 +220,12 @@ findInputs() { } crossPkgs="" -for i in $buildInputs $propagatedBuildInputs; do +for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do findInputs $i crossPkgs propagated-build-inputs done nativePkgs="" -for i in $nativeBuildInputs $propagatedNativeBuildInputs; do +for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do findInputs $i nativePkgs propagated-native-build-inputs done |