Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnupg: unbreak builds without tpm2-tss #189819

Merged
merged 1 commit into from Oct 3, 2022
Merged

gnupg: unbreak builds without tpm2-tss #189819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkgs/tools/security/gnupg/23.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
, libgpg-error, libiconv, npth, gettext, texinfo, buildPackages
, guiSupport ? stdenv.isDarwin, enableMinimal ? false
, adns, bzip2, gnutls, libusb1, openldap
, tpm2-tss, pinentry, readline, sqlite, zlib
, pinentry, readline, sqlite, zlib
, withPcsc ? !enableMinimal, pcsclite
, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss
}:

assert guiSupport -> enableMinimal == false;
Expand All @@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
libgcrypt libassuan libksba libiconv npth gettext
] ++ lib.optionals (!enableMinimal) ([
readline libusb1 gnutls adns openldap zlib bzip2 sqlite
] ++ lib.optional (!stdenv.isDarwin) tpm2-tss);
] ++ lib.optional withTpm2Tss tpm2-tss);

patches = [
./fix-libusb-include-path.patch
Expand Down Expand Up @@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
"--with-ksba-prefix=${libksba.dev}"
"--with-npth-prefix=${npth}"
] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"
++ lib.optional ((!stdenv.isDarwin) && (!enableMinimal)) "--with-tss=intel";
++ lib.optional withTpm2Tss "--with-tss=intel";
postInstall = if enableMinimal
then ''
rm -r $out/{libexec,sbin,share}
Expand Down