diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-10-03 21:36:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 21:36:44 +0200 |
| commit | 9db45eb11c2d4ffa33072bbfce97458f2347e794 (patch) | |
| tree | bb5302341b75c3535c8f91d101d46ad1fb764d53 /pkgs/tools/security | |
| parent | b70049a4632dd4f3349f7cf9dd7c6eda8d5ea64c (diff) | |
| parent | 51f5c65914d2adf62907e3fd95acb5d8da3ee076 (diff) | |
| download | nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar.gz nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar.bz2 nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar.lz nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar.xz nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.tar.zst nixpkgs-9db45eb11c2d4ffa33072bbfce97458f2347e794.zip | |
Merge pull request #189819 from amjoseph-nixpkgs/pr/unbreak/gnupg/tpm
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/gnupg/23.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index cb11e9f7eab..0b7941ce46e 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -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} |