summary refs log tree commit diff
path: root/pkgs/stdenv/generic/builder.sh
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/stdenv/generic/builder.sh')
-rw-r--r--pkgs/stdenv/generic/builder.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 42e1a029e584..bc8f23333f78 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -6,15 +6,20 @@ 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 $out/nix-support
+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"
 if [ "$propagatedUserEnvPkgs" ]; then
-    printf '%s ' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages
+    printf '%s ' $propagatedUserEnvPkgs \
+        > "$out/nix-support/propagated-user-env-packages"
 fi