From dace6a176d39c6f3f520337178c6ed62debf50a8 Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Wed, 19 Oct 2016 21:24:37 +0200 Subject: [PATCH] gnupg: take libusb include path from pkg-config This makes smartcards (like the Nitrokey) usable again. --- pkgs/tools/security/gnupg/21.nix | 1 + .../security/gnupg/fix-libusb-include-path.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/tools/security/gnupg/fix-libusb-include-path.patch diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 34042d802cc..a6328a2140e 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { readline libusb gnutls adns openldap zlib bzip2 ]; + patches = [ ./fix-libusb-include-path.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-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch new file mode 100644 index 00000000000..18c4f110738 --- /dev/null +++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -8872,7 +8872,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5 + $as_echo_n "checking libusb include dir... " >&6; } + usb_incdir_found="no" +- for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do ++ for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do + _libusb_save_cppflags=$CPPFLAGS + if test -n "${_incdir}"; then + CPPFLAGS="-I${_incdir} ${CPPFLAGS}"