From 0dedae51b9756a052b3abe22f7e50697108ef3be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 22:53:40 +0100
Subject: [PATCH] nbtscanner: move to pkgs/by-name

---
 .../security => by-name/nb}/nbtscanner/Cargo.lock.patch     | 0
 .../default.nix => by-name/nb/nbtscanner/package.nix}       | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{tools/security => by-name/nb}/nbtscanner/Cargo.lock.patch (100%)
 rename pkgs/{tools/security/nbtscanner/default.nix => by-name/nb/nbtscanner/package.nix} (90%)

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 {