about summary refs log tree commit diff
path: root/pkgs/tools/security/gnupg
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2020-04-21 08:35:40 +0200
committerGitHub <noreply@github.com>2020-04-21 08:35:40 +0200
commit6673a4988e4a4ff25ca94a84d8e2acf92453dbf1 (patch)
tree1df4cb9b120b3e2a1dda0857fe0d6aad9d86fa0d /pkgs/tools/security/gnupg
parentc9576a4b744e822568958875b3a3f7876dc50f46 (diff)
downloadnixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar.gz
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar.bz2
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar.lz
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar.xz
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.tar.zst
nixlib-6673a4988e4a4ff25ca94a84d8e2acf92453dbf1.zip
gnupg: use libusb1 (#85374)
* gnupg: use libusb1

This fixes scdaemon's direct ccid support.

* systemd: fix gnupg-minimal
Diffstat (limited to 'pkgs/tools/security/gnupg')
-rw-r--r--pkgs/tools/security/gnupg/22.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index f87e985c95ae..7c095cffa311 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -4,7 +4,7 @@
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
 , guiSupport ? true, enableMinimal ? false
-, adns ? null , bzip2 ? null , gnutls ? null , libusb ? null , openldap ? null
+, adns ? null , bzip2 ? null , gnutls ? null , libusb1 ? null , openldap ? null
 , pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ?
 null
 }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig texinfo ];
   buildInputs = [
     libgcrypt libassuan libksba libiconv npth gettext
-    readline libusb gnutls adns openldap zlib bzip2 sqlite
+    readline libusb1 gnutls adns openldap zlib bzip2 sqlite
   ];
 
   patches = [