about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-04-27 17:38:08 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-04-27 17:38:08 -0700
commit00230c92402bb3d94eae0db63cd6d2ba237b541f (patch)
treed8bcad403205bfd782e23aff05458cb31350523f /pkgs
parent9258e8a4bfd180289363d9533e56395115488f03 (diff)
downloadnixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar.gz
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar.bz2
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar.lz
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar.xz
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.tar.zst
nixlib-00230c92402bb3d94eae0db63cd6d2ba237b541f.zip
fusionio: Correct binary testing code
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/fusionio/util.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
index 4605731fbbef..16f1ef73dba5 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
   '';