From 3d457edf8e27ec1598fb7d9dc23dddad90a53269 Mon Sep 17 00:00:00 2001 From: Jiuyang Liu Date: Sun, 19 Dec 2021 12:40:23 +0800 Subject: [PATCH] gnupg23: fix on darwin (#151078) --- pkgs/tools/security/gnupg/23.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index d423c3fe848e..f818dc7f11b0 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext - readline libusb1 gnutls adns openldap zlib bzip2 sqlite tpm2-tss - ]; + readline libusb1 gnutls adns openldap zlib bzip2 sqlite + ] ++ optional (!stdenv.isDarwin) tpm2-tss ; patches = [ ./fix-libusb-include-path.patch @@ -52,8 +52,7 @@ stdenv.mkDerivation rec { "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" - ++ optional (tpm2-tss != null) "--with-tss=intel"; - + ++ optional ( (!stdenv.isDarwin) && (tpm2-tss != null) ) "--with-tss=intel"; postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share}