diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-09 00:03:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 00:03:22 +0000 |
| commit | ee0eae897c11da56192d04dab2f4351ff86424f8 (patch) | |
| tree | 1c3fe2d3ed56e14bfbf0799f2d2b3a719684277f /pkgs/os-specific | |
| parent | 5fcc2889cc128cc89d712668022cc41be256ff45 (diff) | |
| parent | 1c0ef46804d0c6edecf281507ec1aa63bc8a130a (diff) | |
| download | nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar.gz nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar.bz2 nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar.lz nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar.xz nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.tar.zst nixpkgs-ee0eae897c11da56192d04dab2f4351ff86424f8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/usbguard/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 35505af5a1e..b950e2a6575 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -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; |