diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2016-08-20 21:28:34 +0200 |
|---|---|---|
| committer | Lancelot SIX <lsix@lancelotsix.com> | 2016-08-25 12:26:22 +0200 |
| commit | 9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec (patch) | |
| tree | 8b2ad1b326ed76db4b5e90ab97cb4f76195f98a0 /pkgs | |
| parent | eddc0a554900b5868de73971c415bcb0e9c52aec (diff) | |
| download | nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar.gz nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar.bz2 nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar.lz nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar.xz nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.tar.zst nixlib-9ed6e8a01dae7ee6cd26cb6068bbf2eb8b8ad4ec.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/gnupg/21.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/fix-gpgsm-linking.patch | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index cb0f8590ce3b..34042d802ccb 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -27,10 +27,6 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; - # gpgsm-linking is fixed by commit (c49c43d7) in the gnupg master branch; - # fix-gpgsm-linking.patch should be dropped after gnupg 2.1.15 is released - patches = [ ./fix-gpgsm-linking.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch b/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch deleted file mode 100644 index 290d43f5b0d4..000000000000 --- a/pkgs/tools/security/gnupg/fix-gpgsm-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/gpgscm/Makefile.in -+++ b/tests/gpgscm/Makefile.in -@@ -457,7 +457,7 @@ - scheme-config.h opdefines.h scheme.c scheme.h scheme-private.h - - gpgscm_LDADD = $(LDADD) $(common_libs) \ -- $(NETLIBS) $(LIBICONV) $(LIBREADLINE) \ -+ $(NETLIBS) $(LIBICONV) $(LIBREADLINE) $(LIBINTL) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) - - t_child_SOURCES = t-child.c |