summary refs log tree commit diff
path: root/pkgs/build-support/setup-hooks/multiple-outputs.sh
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/build-support/setup-hooks/multiple-outputs.sh')
-rw-r--r--pkgs/build-support/setup-hooks/multiple-outputs.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 1589ecd3734..ac83a7cca3d 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -55,6 +55,7 @@ _multioutConfig() {
 _addRpathPrefix "$outputLib"
 NIX_NO_SELF_RPATH=1
 
+# Move documentation into the desired outputs.
 _multioutDocs() {
     _moveToOutput share/man "$outputMan"
     _moveToOutput share/info "$outputInfo"
@@ -82,13 +83,13 @@ _moveToOutput() {
 }
 
 _multioutPropagateDev() {
-    if [ "$outputInclude" != "$outputDev" ]; then
-        mkdir -p "$outputDev"/nix-support
-        echo "$outputInclude" >> "$outputDev"/nix-support/propagated-build-inputs
+    if [ "$outputInclude" != "$propagateIntoOutput" ]; then
+        mkdir -p "$propagateIntoOutput"/nix-support
+        echo -n " $outputInclude" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
-    if [ "$outputLib" != "$outputDev" ]; then
-        mkdir -p "$outputDev"/nix-support
-        echo "$outputLib" >> "$outputDev"/nix-support/propagated-build-inputs
+    if [ "$outputLib" != "$propagateIntoOutput" ]; then
+        mkdir -p "$propagateIntoOutput"/nix-support
+        echo -n " $outputLib" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
 }