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

gnupg: use libusb1 (#85374)

Browse Source 
* gnupg: use libusb1

This fixes scdaemon's direct ccid support.

* systemd: fix gnupg-minimal
This commit is contained in:
Linus Heckemann 2020-04-21 08:35:40 +02:00 committed by GitHub
parent c9576a4b74
commit 6673a4988e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/systemd/default.nix
View File

@ -24,7 +24,7 @@ let gnupg-minimal = gnupg.override {
pinentry = null; pinentry = null;
adns = null; adns = null;
gnutls = null; gnutls = null;
libusb = null; libusb1 = null;
openldap = null; openldap = null;
readline = null; readline = null;
zlib = null; zlib = null;

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

@ -4,7 +4,7 @@
# Each of the dependencies below are optional. # Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality. # Gnupg can be built without them at the cost of reduced functionality.
, guiSupport ? true, enableMinimal ? false , 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 ? , pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ?
null null
}: }:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig texinfo ]; nativeBuildInputs = [ pkgconfig texinfo ];
buildInputs = [ buildInputs = [
libgcrypt libassuan libksba libiconv npth gettext libgcrypt libassuan libksba libiconv npth gettext
readline libusb gnutls adns openldap zlib bzip2 sqlite readline libusb1 gnutls adns openldap zlib bzip2 sqlite
]; ];
patches = [ patches = [