diff options
| author | Linus Heckemann <git@sphalerite.org> | 2020-04-21 08:35:40 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-06 23:32:42 +0000 |
| commit | 63b6329a947c2ed9aae497ddb033ff0049b6c4cb (patch) | |
| tree | 4afc6801d2e774bc1ab46ba2cd8a68a95807e695 /nixpkgs | |
| parent | ab3773b9b2a1716887d15f80482aa993c153212d (diff) | |
| download | nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar.gz nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar.bz2 nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar.lz nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar.xz nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.tar.zst nixlib-63b6329a947c2ed9aae497ddb033ff0049b6c4cb.zip | |
gnupg: use libusb1 (#85374)
* gnupg: use libusb1 This fixes scdaemon's direct ccid support. * systemd: fix gnupg-minimal (cherry picked from commit 6673a4988e4a4ff25ca94a84d8e2acf92453dbf1)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/systemd/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/security/gnupg/22.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 1dd2f30b9bfc..369f93ba1104 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -23,7 +23,7 @@ let gnupg-minimal = gnupg.override { pinentry = null; adns = null; gnutls = null; - libusb = null; + libusb1 = null; openldap = null; readline = null; zlib = null; diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix index 86339b34b03e..24b3b34c3a7a 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/nixpkgs/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 = [ |