BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnupg: unbreak builds without tpm2-tss

Browse source 
Builds without tpm2-tss no longer seem to work after #183753.  This PR fixes
that.
This commit is contained in:
Adam Joseph 2022-09-05 00:41:42 -07:00
parent ae1d03834e
commit 51f5c65914
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/security/gnupg/23.nix
View file

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