about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2023-11-24 07:35:39 -0300
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-11-25 20:11:32 -0300
commiteab0837b6803f776a5eb055ffcc9c8041807036a (patch)
tree7136dcd89448e62790096d57e5c79c05887af6a2 /pkgs/os-specific
parent1129756b1a44deeeb08d09e4745f2aa8ed428282 (diff)
systemd: remove some redundancy on mesonFlags
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix24
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4e58972e4ba68..6c91b0fbf0261 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -552,20 +552,16 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals (withShellCompletions == false) [
     (lib.mesonOption "bashcompletiondir" "no")
     (lib.mesonOption "zshcompletiondir" "no")
-  ] ++ lib.optionals (!withNss) [
-    (lib.mesonBool "nss-myhostname" false)
-    (lib.mesonBool "nss-mymachines" false)
-    (lib.mesonBool "nss-resolve" false)
-    (lib.mesonBool "nss-systemd" false)
-  ] ++ lib.optionals withLibBPF [
-    (lib.mesonBool "bpf-framework" true)
-  ] ++ lib.optionals withTpm2Tss [
-    (lib.mesonBool "tpm2" true)
-  ] ++ lib.optionals (!withUtmp) [
-    (lib.mesonBool "utmp" false)
-  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
-    (lib.mesonBool "gshadow" false)
-    (lib.mesonBool "idn" false)
+
+    (lib.mesonBool "nss-myhostname" withNss)
+    (lib.mesonBool "nss-mymachines" withNss)
+    (lib.mesonBool "nss-resolve" withNss)
+    (lib.mesonBool "nss-systemd" withNss)
+    (lib.mesonBool "bpf-framework" withLibBPF)
+    (lib.mesonBool "tpm2" withTpm2Tss)
+    (lib.mesonBool "utmp" withUtmp)
+    (lib.mesonBool "gshadow" (!stdenv.hostPlatform.isMusl))
+    (lib.mesonBool "idn" (!stdenv.hostPlatform.isMusl))
   ] ++ lib.optionals withKmod [
     (lib.mesonBool "kmod" true)
     (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")