Skip to content

Commit d47ff72

Browse files
step-ca: move to pkgs/by-name
1 parent 15bd652 commit d47ff72

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
buildGoModule,
66
coreutils,
77
pcsclite,
8-
PCSC,
98
pkg-config,
109
hsmSupport ? true,
1110
nixosTests,
11+
darwin,
1212
}:
1313

1414
buildGoModule rec {
@@ -33,8 +33,7 @@ buildGoModule rec {
3333

3434
buildInputs =
3535
lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]
36-
++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ];
37-
36+
++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ];
3837
postPatch = ''
3938
substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {'
4039
substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill"

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5881,10 +5881,6 @@ with pkgs;
58815881
callPackage ../tools/misc/steampipe-packages { }
58825882
);
58835883

5884-
step-ca = callPackage ../tools/security/step-ca {
5885-
inherit (darwin.apple_sdk.frameworks) PCSC;
5886-
};
5887-
58885884
step-kms-plugin = callPackage ../tools/security/step-kms-plugin { };
58895885

58905886
string-machine = callPackage ../applications/audio/string-machine { };

0 commit comments

Comments
 (0)