b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

usbguard: remove unused libgcrypt crypto backend

Browse source
This commit is contained in:
Sandro Jäckel 2022-08-22 11:42:23 +02:00
parent 2173250011
commit 609deacfc8
No known key found for this signature in database
GPG key ID: B1763F8651144063
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/usbguard/default.nix
View file

@ -17,12 +17,9 @@
, polkit
, protobuf
, audit
, libgcrypt
, libsodium
}:
assert libgcrypt != null -> libsodium == null;
stdenv.mkDerivation rec {
version = "1.1.1";
pname = "usbguard";
@ -51,21 +48,19 @@ stdenv.mkDerivation rec {
libcap_ng
libqb
libseccomp
libsodium
polkit
protobuf
audit
]
++ (lib.optional (libgcrypt != null) libgcrypt)
++ (lib.optional (libsodium != null) libsodium);
];
configureFlags = [
"--with-bundled-catch"
"--with-bundled-pegtl"
"--with-dbus"
"--with-crypto-library=sodium"
"--with-polkit"
]
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
];
enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View file

@ -24787,9 +24787,7 @@ with pkgs;
upower = callPackage ../os-specific/linux/upower { };
usbguard = callPackage ../os-specific/linux/usbguard {
libgcrypt = null;
};
usbguard = callPackage ../os-specific/linux/usbguard { };
usbrelay = callPackage ../os-specific/linux/usbrelay { };
usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };