Merge pull request #168703 from Artturin/testversion1

2022-04-17 22:40:45 +03:00
parent 56d7a75ad7 390439d726
commit 3886bcd30f
1 changed files with 6 additions and 2 deletions
@@ -814,7 +814,11 @@ rec {
      command ? "${package.meta.mainProgram or package.pname or package.name} --version",
      version ? package.version,
    }: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
-      ${command} |& grep -Fw ${version}
-      touch $out
+      if output=$(${command} 2>&1); then
+        grep -Fw "${version}" - <<< "$output"
+        touch $out
+      else
+        echo "$output" >&2 && exit 1
+      fi
    '';
 }