From d47ff720e4fc8a8a00427b312fe53fbca2c150c4 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 24 Oct 2024 22:06:04 -0400
Subject: [PATCH] step-ca: move to pkgs/by-name

---
 .../step-ca/default.nix => by-name/st/step-ca/package.nix}   | 5 ++---
 pkgs/top-level/all-packages.nix                              | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)
 rename pkgs/{tools/security/step-ca/default.nix => by-name/st/step-ca/package.nix} (97%)

diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/by-name/st/step-ca/package.nix
similarity index 97%
rename from pkgs/tools/security/step-ca/default.nix
rename to pkgs/by-name/st/step-ca/package.nix
index d03f4950816e..911c479c7189 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -5,10 +5,10 @@
   buildGoModule,
   coreutils,
   pcsclite,
-  PCSC,
   pkg-config,
   hsmSupport ? true,
   nixosTests,
+  darwin,
 }:
 
 buildGoModule rec {
@@ -33,8 +33,7 @@ buildGoModule rec {
 
   buildInputs =
     lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]
-    ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ];
-
+    ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ];
   postPatch = ''
     substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {'
     substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a83767058ee7..c5f476bd71ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5881,10 +5881,6 @@ with pkgs;
     callPackage ../tools/misc/steampipe-packages { }
   );
 
-  step-ca = callPackage ../tools/security/step-ca {
-    inherit (darwin.apple_sdk.frameworks) PCSC;
-  };
-
   step-kms-plugin = callPackage ../tools/security/step-kms-plugin { };
 
   string-machine = callPackage ../applications/audio/string-machine { };