diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-08 00:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 00:02:10 +0000 |
| commit | b4569f7a815bb1ad98057c795fb3ba916d12b7a5 (patch) | |
| tree | 3237323d7e3df70d1b13956713be889b8be11500 /pkgs/os-specific/linux/systemd | |
| parent | 080cff50324f91e155cf3779f4e3a2e1967e96ec (diff) | |
| parent | bc59af36f0e6d7117240d609e0ba3f6317295788 (diff) | |
| download | nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar.gz nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar.bz2 nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar.lz nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar.xz nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.tar.zst nixpkgs-b4569f7a815bb1ad98057c795fb3ba916d12b7a5.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 81e6818b3cc..3cb9216b184 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -32,7 +32,7 @@ , acl , lz4 , libgcrypt -, libgpgerror +, libgpg-error , libidn2 , curl , gnutar @@ -105,7 +105,7 @@ , docbook_xml_dtd_45 }: -assert withResolved -> (libgcrypt != null && libgpgerror != null); +assert withResolved -> (libgcrypt != null && libgpg-error != null); assert withImportd -> (curl.dev != null && zlib != null && xz != null && libgcrypt != null && gnutar != null && gnupg != null && withCompression); @@ -352,7 +352,7 @@ stdenv.mkDerivation { ++ lib.optional withLibseccomp libseccomp ++ lib.optional withNetworkd iptables ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror + ++ lib.optional withResolved libgpg-error ++ lib.optional withSelinux libselinux ++ lib.optional withRemote libmicrohttpd ++ lib.optionals withHomed [ p11-kit ] |