usbguard: remove unused libgcrypt crypto backend
This commit is contained in:
parent
2173250011
commit
609deacfc8
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue