public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnupg21: Removes previously backported patch

Browse Source 
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
This commit is contained in:
Lancelot SIX 2016-08-20 21:28:34 +02:00
parent eddc0a5549
commit 9ed6e8a01d
No known key found for this signature in database
GPG Key ID: 02E1542BA66FB047
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/gnupg/21.nix
View File

@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
readline libusb gnutls adns openldap zlib bzip2 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 '' postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
''; #" fix Emacs syntax highlighting :-( ''; #" fix Emacs syntax highlighting :-(

11
pkgs/tools/security/gnupg/fix-gpgsm-linking.patch
View File

@ -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