From 52c433735699201babf07a59bf7c54c1ae17e68e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 20 Aug 2015 02:53:31 +0300 Subject: [PATCH] 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") --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 ++ 1 file changed, 2 insertions(+) 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