diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-18 05:07:03 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-18 13:21:56 +0300 |
| commit | 7320fa9d4581e634fec4db848d7a4d157a51303d (patch) | |
| tree | bf13c19fab45fd47363661a48e3050e9ab40a0eb /pkgs/stdenv/generic/builder.sh | |
| parent | 6a60cca7ab2ed7f69528b5ae961211853e91905f (diff) | |
Revert "stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs`"
This reverts commit eeabf85780e7fccc0289b4015b695e28ef166ab7.
This change suddenly makes tons of stdenv internals visible in
nativeBuildInputs of every derivation, which doesn't seem desirable.
E.g:
````
nix-repl> hello.nativeBuildInputs
[ «derivation /nix/store/bcfkyf6bhssxd2vzwgzmsbn7b5b9rpxc-patchelf-0.9.drv»
«derivation /nix/store/4wnshnz9wwanpfzcrdd76rri7pyqn9sk-paxctl-0.9.drv»
<< snip 10+ lines >>
«derivation /nix/store/d35pgh1lcg5nm0x28d899pxj30b8c9b2-gcc-wrapper-6.4.0.drv»
]
````
Diffstat (limited to 'pkgs/stdenv/generic/builder.sh')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index bc8f23333f78..42e1a029e584 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -6,20 +6,15 @@ done mkdir $out -# Buid the setup script echo "export SHELL=$shell" > $out/setup echo "initialPath=\"$initialPath\"" >> $out/setup +echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup echo "$preHook" >> $out/setup cat "$setup" >> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. -mkdir -p "$out/nix-support" -echo '# Hack to induce runtime dependencies on the default inputs' \ - > "$out/nix-support/default-inputs.txt" -printf '%s\n' $defaultNativeBuildInputs $defaultBuildInputs \ - >> "$out/nix-support/default-inputs.txt" +mkdir $out/nix-support if [ "$propagatedUserEnvPkgs" ]; then - printf '%s ' $propagatedUserEnvPkgs \ - > "$out/nix-support/propagated-user-env-packages" + printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages fi |