diff options
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 60d4ccf99ed1..ac2368a5b219 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -164,8 +164,6 @@ _multioutDevs() { } # Make the "dev" propagate other outputs needed for development. -# Note: with current cross-building setup, all packages are "native" if not cross-building; -# however, if cross-building, the outputs are non-native. We have to choose the right file. _multioutPropagateDev() { if [ "$outputs" = "out" ]; then return; fi; @@ -193,16 +191,8 @@ _multioutPropagateDev() { return fi - local propagatedBuildInputsFile - if [ -z "$crossConfig" ]; then - propagatedBuildInputsFile=propagated-native-build-inputs - else - propagatedBuildInputsFile=propagated-build-inputs - fi - mkdir -p "${!propagaterOutput}"/nix-support for output in $propagatedBuildOutputs; do - echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile + echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/propagated-build-inputs done } - |