step-ca: move to pkgs/by-name

This commit is contained in:
techknowlogick 2024-10-24 22:06:04 -04:00
parent 15bd652864
commit d47ff720e4
2 changed files with 2 additions and 7 deletions

View File

@ -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"

View File

@ -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 { };