Pick #311675: fix: systemd build flag combinations

(cherry picked from commit 3a4faefddf)
This commit is contained in:
Florian Klink 2024-05-15 17:30:22 +02:00 committed by Vladimír Čunát
parent d0aa0283c2
commit ee776dd5df
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -552,7 +552,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.mesonEnable "zlib" withCompression)
# NSS
(lib.mesonEnable "nss-mymachines" withNss)
(lib.mesonEnable "nss-mymachines" (withNss && withMachined))
(lib.mesonEnable "nss-resolve" withNss)
(lib.mesonBool "nss-myhostname" withNss)
(lib.mesonBool "nss-systemd" withNss)
@ -564,7 +564,7 @@ stdenv.mkDerivation (finalAttrs: {
# FIDO2
(lib.mesonEnable "libfido2" withFido2)
(lib.mesonEnable "openssl" withFido2)
(lib.mesonEnable "openssl" (withHomed || withFido2 || withSysupdate))
# Password Quality
(lib.mesonEnable "pwquality" withPasswordQuality)