Merge pull request #215094 from chuangzhu/systemd-want-gcrypt

systemd: fix build when withResolved=false and withImportd=true
This commit is contained in:
Florian Klink 2023-02-07 12:49:32 +01:00 committed by GitHub
commit 025d8692b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -384,7 +384,7 @@ stdenv.mkDerivation {
pam
]
++ lib.optional wantGcrypt libgcrypt
++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ]
++ lib.optional withTests glib
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
@ -396,7 +396,6 @@ stdenv.mkDerivation {
++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpg-error
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
++ lib.optionals withHomed [ p11-kit ]