diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-09-08 22:00:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-08 22:00:06 +0200 |
| commit | 0b0b3498600368ec6cad1f6b9b664c05ce2354b8 (patch) | |
| tree | ead36f0cbc73d24e753253b4f8a900678cd808e2 /pkgs/os-specific | |
| parent | ac5e7351d19727d5efdb6de3e9e471aae7729da0 (diff) | |
| parent | 609deacfc804d941b947a1f4b123f1963b9811d8 (diff) | |
| download | nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar.gz nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar.bz2 nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar.lz nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar.xz nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.tar.zst nixpkgs-0b0b3498600368ec6cad1f6b9b664c05ce2354b8.zip | |
Merge pull request #187843 from SuperSandro2000/usbguard
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; |