nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #311675 from nrdxp/fix-systemd-build-flag-combinations

Browse Source 
fix: systemd build flag combinations
This commit is contained in:
Florian Klink
2024-05-15 17:30:22 +02:00
committed by GitHub
parent 67641d0589 e5b250b3c2
commit 3a4faefddf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/systemd/default.nix
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)