diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-07 22:24:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 22:24:04 +0200 |
| commit | 628dbc979f782d0501ab6c272b55b0532a96c85a (patch) | |
| tree | fa8557520a4df7fd8697da0754268efa036cc332 /pkgs/os-specific | |
| parent | 0735bf37e1ca961a482c53452c387d523d74f2e0 (diff) | |
| parent | 41574158a07f3c6ab5853b316c2fe7ed18e6354b (diff) | |
| download | nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar.gz nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar.bz2 nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar.lz nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar.xz nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.tar.zst nixpkgs-628dbc979f782d0501ab6c272b55b0532a96c85a.zip | |
Merge pull request #136719 from r-burns/libgpg-error
Diffstat (limited to 'pkgs/os-specific')
| -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 e0a4128b0cd..3af70ff9151 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); @@ -347,7 +347,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 ] |