tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

gnupg21: Removes previously backported patch

fix-gpgsm-linking.patch was backported from gnupg master for 2.1.14. It
is included in 2.1.15, making the patch un applicable.

Fixes 447207d21d63e285dccdb992751a5e72f339e3e0

Lancelot SIX 9ed6e8a0 eddc0a55

-15
unified split
-4
pkgs/tools/security/gnupg/21.nix
··· 27 readline libusb gnutls adns openldap zlib bzip2 28 ]; 29 30 - # gpgsm-linking is fixed by commit (c49c43d7) in the gnupg master branch; 31 - # fix-gpgsm-linking.patch should be dropped after gnupg 2.1.15 is released 32 - patches = [ ./fix-gpgsm-linking.patch ]; 33 - 34 postPatch = stdenv.lib.optionalString stdenv.isLinux '' 35 sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c 36 ''; #" fix Emacs syntax highlighting :-(
··· 27 readline libusb gnutls adns openldap zlib bzip2 28 ]; 29 30 postPatch = stdenv.lib.optionalString stdenv.isLinux '' 31 sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c 32 ''; #" fix Emacs syntax highlighting :-(
-11
pkgs/tools/security/gnupg/fix-gpgsm-linking.patch
··· 1 - --- a/tests/gpgscm/Makefile.in 2 - +++ b/tests/gpgscm/Makefile.in 3 - @@ -457,7 +457,7 @@ 4 - scheme-config.h opdefines.h scheme.c scheme.h scheme-private.h 5 - 6 - gpgscm_LDADD = $(LDADD) $(common_libs) \ 7 - - $(NETLIBS) $(LIBICONV) $(LIBREADLINE) \ 8 - + $(NETLIBS) $(LIBICONV) $(LIBREADLINE) $(LIBINTL) \ 9 - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) 10 - 11 - t_child_SOURCES = t-child.c
···