alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #17642 from svend/gnupg21-fix-gpgsm-linking

Browse source 
gnupg: Fix gpgsm linking for gnupg 2.1.14
This commit is contained in:
Daniel Peebles 2016-08-15 14:19:19 -04:00 committed by GitHub
parent ef15f01a43 ac2836610d
commit 65ed79a1e8
2 changed files with 15 additions and 0 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,6 +27,10 @@ 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 :-(

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

@ -0,0 +1,11 @@
--- 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