Skip to content

Commit 2ca9c4f

Browse files
authored
strongswan: add enableTPM2 option and tpm2-tss library (#387637)
2 parents c5ac355 + 672199a commit 2ca9c4f

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

pkgs/by-name/st/strongswan/package.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
, systemd, pam
66
, curl
77
, enableTNC ? false, trousers, sqlite, libxml2
8+
, enableTPM2 ? false, tpm2-tss
89
, enableNetworkManager ? false, networkmanager
910
, darwin
1011
, nixosTests
@@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
3132
buildInputs =
3233
[ curl gmp python3 ldns unbound openssl pcsclite ]
3334
++ lib.optionals enableTNC [ trousers sqlite libxml2 ]
35+
++ lib.optional enableTPM2 tpm2-tss
3436
++ lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev pam iptables ]
3537
++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ])
3638
++ lib.optionals enableNetworkManager [ networkmanager glib ];
@@ -80,6 +82,8 @@ stdenv.mkDerivation rec {
8082
"--with-tss=trousers"
8183
"--enable-aikgen"
8284
"--enable-sqlite" ]
85+
++ lib.optionals enableTPM2 [
86+
"--enable-tpm" "--enable-tss-tss2" ]
8387
++ lib.optionals enableNetworkManager [
8488
"--enable-nm"
8589
"--with-nm-ca-dir=/etc/ssl/certs" ]

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5033,6 +5033,7 @@ with pkgs;
50335033
stutter = haskell.lib.compose.justStaticExecutables haskellPackages.stutter;
50345034

50355035
strongswanTNC = strongswan.override { enableTNC = true; };
5036+
strongswanTPM = strongswan.override { enableTPM2 = true; };
50365037
strongswanNM = strongswan.override { enableNetworkManager = true; };
50375038

50385039
stylish-haskell = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-haskell;

0 commit comments

Comments
 (0)