cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

systemd: remove some redundancy on mesonFlags

Browse source
This commit is contained in:
Anderson Torres 2023-11-24 07:35:39 -03:00
parent 1129756b1a
commit eab0837b68
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/os-specific/linux/systemd/default.nix
View file

@ -552,20 +552,16 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (withShellCompletions == false) [ ] ++ lib.optionals (withShellCompletions == false) [
(lib.mesonOption "bashcompletiondir" "no") (lib.mesonOption "bashcompletiondir" "no")
(lib.mesonOption "zshcompletiondir" "no") (lib.mesonOption "zshcompletiondir" "no")
] ++ lib.optionals (!withNss) [
(lib.mesonBool "nss-myhostname" false) (lib.mesonBool "nss-myhostname" withNss)
(lib.mesonBool "nss-mymachines" false) (lib.mesonBool "nss-mymachines" withNss)
(lib.mesonBool "nss-resolve" false) (lib.mesonBool "nss-resolve" withNss)
(lib.mesonBool "nss-systemd" false) (lib.mesonBool "nss-systemd" withNss)
] ++ lib.optionals withLibBPF [ (lib.mesonBool "bpf-framework" withLibBPF)
(lib.mesonBool "bpf-framework" true) (lib.mesonBool "tpm2" withTpm2Tss)
] ++ lib.optionals withTpm2Tss [ (lib.mesonBool "utmp" withUtmp)
(lib.mesonBool "tpm2" true) (lib.mesonBool "gshadow" (!stdenv.hostPlatform.isMusl))
] ++ lib.optionals (!withUtmp) [ (lib.mesonBool "idn" (!stdenv.hostPlatform.isMusl))
(lib.mesonBool "utmp" false)
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(lib.mesonBool "gshadow" false)
(lib.mesonBool "idn" false)
] ++ lib.optionals withKmod [ ] ++ lib.optionals withKmod [
(lib.mesonBool "kmod" true) (lib.mesonBool "kmod" true)
(lib.mesonOption "kmod-path" "${kmod}/bin/kmod") (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")