From 00230c92402bb3d94eae0db63cd6d2ba237b541f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 27 Apr 2015 17:38:08 -0700 Subject: [PATCH] fusionio: Correct binary testing code --- pkgs/os-specific/linux/fusionio/util.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix index 4605731fbbe..16f1ef73dba 100644 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -19,7 +19,16 @@ stdenv.mkDerivation { for BIN in $(find $out/bin -type f); do echo Patching $BIN patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN - $BIN --help >/dev/null 2>&1 || [ "$?" -lt "128" ] || { echo "Failed testing $BIN"; exit 1; } + + # Test our binary to see if it was correctly patched + set +e + $BIN --help >/dev/null 2>&1 + ST="$?" + set -e + if [ "$ST" -ge "10" ]; then + echo "Failed testing $BIN" + exit 1; + fi done '';