diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-08-20 02:53:31 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:08:48 +0200 |
| commit | 52c433735699201babf07a59bf7c54c1ae17e68e (patch) | |
| tree | 6a218408f129f6fb5df31a979d7a0673bbe15058 /pkgs/build-support/setup-hooks | |
| parent | 2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb (diff) | |
| download | nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar.gz nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar.bz2 nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar.lz nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar.xz nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.tar.zst nixlib-52c433735699201babf07a59bf7c54c1ae17e68e.zip | |
stdenv/multiple-outputs: Guard greps with 'set +/-o pipefail'
This is required since #7524 is fixed ("stdenv: Errors in hooks (such as
postUnpack) get ignored")
Diffstat (limited to 'pkgs/build-support/setup-hooks')
| -rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 7527000eb257..08e2106acc70 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -138,9 +138,11 @@ _multioutPropagateDev() { # Default value: propagate binaries, includes and libraries if [[ ! -v "$propagatedOutputs" ]]; then local po_dirty="$outputBin $outputInclude $outputLib" + set +o pipefail propagatedOutputs=`echo "$po_dirty" \ | tr -s ' ' '\n' | grep -v -F "$outputFirst" \ | sort -u | tr '\n' ' ' ` + set -o pipefail elif [ -z "$propagatedOutputs" ]; then return # variable was explicitly set to empty |