From 90b665e475e5b60e89920b2d9254f8713b2420bb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jringer@anduril.com>
Date: Wed, 11 Sep 2024 23:17:45 -0700
Subject: [PATCH] Avoid double wrapping

Signed-off-by: Jonathan Ringer <jringer@anduril.com>
---
 nix/packages.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/nix/packages.nix b/nix/packages.nix
index 9fc3304..8e46704 100644
--- a/nix/packages.nix
+++ b/nix/packages.nix
@@ -210,23 +210,11 @@
 
         pythonImportsCheck = ["sbomnix"];
 
-        postInstall = ''
-
-          wrapProgram $out/bin/sbomnix \
-              --prefix PATH : ${lib.makeBinPath [pkgs.git pkgs.nix pkgs.graphviz]}
-
-          wrapProgram $out/bin/nixgraph \
-              --prefix PATH : ${lib.makeBinPath [pkgs.nix pkgs.graphviz]}
-
-          wrapProgram $out/bin/nix_outdated \
-              --prefix PATH : ${lib.makeBinPath [pkgs.git nix-visualize]}
-
-          wrapProgram $out/bin/vulnxscan \
-              --prefix PATH : ${lib.makeBinPath [pkgs.git pkgs.grype pkgs.nix vulnix]}
-
-          wrapProgram $out/bin/provenance \
-              --prefix PATH : ${lib.makeBinPath [pkgs.nix]}
-        '';
+        makeWrapperArgs = [
+          "--prefix PATH : ${lib.makeBinPath (with pkgs; [
+            git nix graphviz nix-visualize vulnix grype
+          ])}"
+        ];
       };
       # a python with all python packages imported by sbomnix itself
       python = pkgs.python3.withPackages (ps: