diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-17 13:26:21 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-21 10:44:44 -0500 |
commit | da19c34d0fd335424e734c3bec9ca87687eb15f0 (patch) | |
tree | d6ee6f1c3e16dfc3d3dab6226bfd9cff97e296de /pkgs/build-support/setup-hooks | |
parent | 652c2beda9a5351ddd07e422215100aca75412ae (diff) | |
download | nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.gz nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.bz2 nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.lz nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.xz nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.zst nixlib-da19c34d0fd335424e734c3bec9ca87687eb15f0.zip |
stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by always including both propagated files: `propgated-native-build-inputs` and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still defined as before, however, so this change should only barely observable. This is an incremental step to fully keeping the dependencies separate in all cases.
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 } - |