about summary refs log tree commit diff
path: root/pkgs/build-support/setup-hooks
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-10 11:59:14 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-10 13:32:13 -0400
commit3cb745d5a69018829ac15f7d5a508135f6bda123 (patch)
treeb12220dc50d09a0dec9cd6a174a2032e0f28748c /pkgs/build-support/setup-hooks
parentf385e224e5962cc80026171249a230d7111cc9bf (diff)
downloadnixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.gz
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.bz2
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.lz
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.xz
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.tar.zst
nixlib-3cb745d5a69018829ac15f7d5a508135f6bda123.zip
stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r--pkgs/build-support/setup-hooks/multiple-outputs.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 62a6491b8dc0..9abf50f6ea47 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -202,7 +202,7 @@ _multioutPropagateDev() {
 
     mkdir -p "${!propagaterOutput}"/nix-support
     for output in $propagatedBuildOutputs; do
-        echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
+        echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
     done
 }