From 5f069f855c6c67cf4a7c1c936a1a2a2f3e6b0922 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Mon, 1 Nov 2021 14:45:18 -0400
Subject: [PATCH] security-toolbox: remove "self"

---
 flake.nix                         |  2 +-
 pkgs/default.nix                  |  5 +---
 pkgs/security-toolbox/default.nix | 40 ++++++++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8612535..3be2847 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
 
   outputs = { self, nixpkgs, impermanence, ... }:
     let
-      mypkgs = import ./pkgs self;
+      mypkgs = import ./pkgs;
     in
     {
       nixosModules =
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 98e2897..f56ba66 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,3 @@
-self:
 pkgs:
 
 let
@@ -16,10 +15,8 @@ let
     {
       binaryninja = pkgs.callPackage ./binary-ninja-personal { };
       packettracer = pkgs.callPackage ./packettracer { };
+      security-toolbox = pkgs.callPackage ./security-toolbox { inherit (allArchs) gef webshells weevely; };
       SpaceCadetPinball = pkgs.callPackage ./SpaceCadetPinball { };
-      security-toolbox = pkgs.callPackage ./security-toolbox {
-        pkgs = pkgs // self.packages.${pkgs.system};
-      };
     };
 
 in
diff --git a/pkgs/security-toolbox/default.nix b/pkgs/security-toolbox/default.nix
index 692342a..4f29ce0 100644
--- a/pkgs/security-toolbox/default.nix
+++ b/pkgs/security-toolbox/default.nix
@@ -1,8 +1,35 @@
-{ pkgs }:
+{ symlinkJoin
+, writeShellScriptBin
+, ungoogled-chromium
+, binutils
+, bridge-utils
+, dhcpdump
+, dirb
+, exiftool
+, gef
+, ghidra-bin
+, gobuster
+, iptables-nftables-compat
+, macchanger
+, masscan
+, metasploit
+, net-snmp
+, nmap
+, openvpn
+, remmina
+, socat
+, thc-hydra
+, webshells
+, weevely
+, wfuzz
+, burpsuite
+, postman
+}:
+
 let
 
-  proxybrowser = pkgs.writeShellScriptBin "proxybrowser" ''
-    exec ${pkgs.ungoogled-chromium}/bin/chromium \
+  proxybrowser = writeShellScriptBin "proxybrowser" ''
+    exec ${ungoogled-chromium}/bin/chromium \
     --disable-background-networking \
     --disable-default-apps \
     --disable-plugins-discovery \
@@ -19,10 +46,12 @@ let
   '';
 
 in
-pkgs.symlinkJoin {
+symlinkJoin {
   name = "security-toolbox";
-  paths = with pkgs;
+  paths =
     [
+      proxybrowser
+
       binutils
       bridge-utils
       dhcpdump
@@ -38,7 +67,6 @@ pkgs.symlinkJoin {
       net-snmp
       nmap
       openvpn
-      proxybrowser
       remmina
       socat
       thc-hydra