diff --git a/pkgs/tools/security/nbtscanner/Cargo.lock.patch b/pkgs/by-name/nb/nbtscanner/Cargo.lock.patch similarity index 100% rename from pkgs/tools/security/nbtscanner/Cargo.lock.patch rename to pkgs/by-name/nb/nbtscanner/Cargo.lock.patch diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/by-name/nb/nbtscanner/package.nix similarity index 90% rename from pkgs/tools/security/nbtscanner/default.nix rename to pkgs/by-name/nb/nbtscanner/package.nix index 06e824463106..17894259a546 100644 --- a/pkgs/tools/security/nbtscanner/default.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, - rustPlatform, + darwin, fetchFromGitHub, - Security, + rustPlatform, versionCheckHook, }: @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '.version("0.1")' '.version("${version}")' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e864279ba1bd..5fc35b5ebbc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4205,10 +4205,6 @@ with pkgs; nanoemoji = with python3Packages; toPythonApplication nanoemoji; - nbtscanner = callPackage ../tools/security/nbtscanner { - inherit (darwin.apple_sdk.frameworks) Security; - }; - netexec = python3Packages.callPackage ../tools/security/netexec { }; netdata = callPackage ../tools/system/netdata {