From d9a9dcca20f43d793dce231536f1e9b9ef094d33 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 12 Sep 2022 18:22:33 -0400 Subject: [PATCH] gnupg: add withPcsc flag to disable PC/SC support pcsclite pulls in a lot of dependencies, including spidermonkey, which is nearly or completely impossible to build on 32-bit architectures. PC/SC support is not commonly used, so provide a flag to allow users to disable it and significantly reduce the closure size. --- pkgs/tools/security/gnupg/23.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index af28b4903df2..cb11e9f7eab6 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -2,7 +2,8 @@ , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap -, tpm2-tss, pcsclite, pinentry, readline, sqlite, zlib +, tpm2-tss, pinentry, readline, sqlite, zlib +, withPcsc ? !enableMinimal, pcsclite }: assert guiSupport -> enableMinimal == false; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' sed -i 's,\(hkps\|https\)://keyserver.ubuntu.com,hkps://keys.openpgp.org,g' configure configure.ac doc/dirmngr.texi doc/gnupg.info-1 - '' + lib.optionalString (stdenv.isLinux && (!enableMinimal)) '' + '' + lib.optionalString (stdenv.isLinux && withPcsc) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c '';