Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

1 files changed, 13 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
index cc4aed0262ff..6e982aee01a3 100644
--- a/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
+++ b/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix
@@ -1,7 +1,17 @@
-{ lib, runCommand, makeBinaryWrapper, cargo, cargo-auditable }:
+{ lib, runCommand, makeBinaryWrapper, rust-audit-info, cargo, cargo-auditable }:
 
+if cargo-auditable.meta.broken then
+  cargo
+else
 runCommand "auditable-${cargo.name}" {
   nativeBuildInputs = [ makeBinaryWrapper ];
+
+  passthru.tests = runCommand "rust-audit-info-test" {
+    nativeBuildInputs = [ rust-audit-info ];
+  } ''
+    rust-audit-info ${lib.getBin rust-audit-info}/bin/rust-audit-info > $out
+  '';
+
   meta = cargo-auditable.meta // {
     mainProgram = "cargo";
   };
@@ -9,5 +19,6 @@ runCommand "auditable-${cargo.name}" {
   mkdir -p $out/bin
   makeWrapper ${cargo}/bin/cargo $out/bin/cargo \
     --set CARGO_AUDITABLE_IGNORE_UNSUPPORTED 1 \
-    --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]}
+    --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} \
+    --add-flags auditable
 ''