diff options
author | Florian Klink <flokli@flokli.de> | 2020-11-25 00:11:56 +0100 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-11-25 00:22:37 +0100 |
commit | b92942f4668d9bf45df3aead90eddb636ec6db28 (patch) | |
tree | 8a94f0295f7c7260e1a8900cc9a88c94c9dba0e9 /pkgs/os-specific/linux | |
parent | 16aaf679e65d11ad37444a9f3777c82b0915bdcd (diff) | |
download | nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar.gz nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar.bz2 nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar.lz nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar.xz nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.tar.zst nixpkgs-b92942f4668d9bf45df3aead90eddb636ec6db28.zip |
systemd: use withPortabled in mesonFlags
No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 13b52b86ff4..478791bded0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -57,11 +57,12 @@ , withAnalyze ? true , withApparmor ? true -, withCoredump ? true , withCompression ? true # adds bzip2, lz4 and xz +, withCoredump ? true , withCryptsetup ? true , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi +, withHomed ? false , withHostnamed ? true , withHwdb ? true , withImportd ? true @@ -72,14 +73,15 @@ , withNss ? true , withPCRE2 ? true , withPolkit ? true +, withPortabled ? false , withRemote ? true , withResolved ? true , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true , withUserDb ? true -, withHomed ? false, p11-kit, libfido2 -# , withPortabled ? false TODO +, p11-kit +, libfido2 # name argument , pname ? "systemd" @@ -94,7 +96,7 @@ assert withResolved -> (libgcrypt != null && libgpgerror != null); assert withImportd -> (curl.dev != null && zlib != null && xz != null && libgcrypt != null - && gnutar != null && gnupg != null && withCompression ); + && gnutar != null && gnupg != null && withCompression); assert withEfi -> (gnu-efi != null); assert withRemote -> lib.getDev curl != null; @@ -104,7 +106,6 @@ assert withHomed -> withCryptsetup; assert withCryptsetup -> (cryptsetup != null); - let wantCurl = withRemote || withImportd; @@ -196,20 +197,20 @@ stdenv.mkDerivation { pam ] - ++ lib.optional withApparmor libapparmor - ++ lib.optional wantCurl (lib.getDev curl) + ++ lib.optional withApparmor libapparmor + ++ lib.optional wantCurl (lib.getDev curl) ++ lib.optionals withCompression [ bzip2 lz4 xz ] - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexectools - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withNetworkd iptables - ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror - ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withEfi gnu-efi + ++ lib.optional withKexectools kexectools + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional withNetworkd iptables + ++ lib.optional withPCRE2 pcre2 + ++ lib.optional withResolved libgpgerror + ++ lib.optional withSelinux libselinux + ++ lib.optional withRemote libmicrohttpd ++ lib.optionals withHomed [ p11-kit libfido2 ] - ; + ; #dontAddPrefix = true; @@ -240,7 +241,7 @@ stdenv.mkDerivation { "-Dnetworkd=${lib.boolToString withNetworkd}" "-Dpolkit=${lib.boolToString withPolkit}" "-Dcryptsetup=${lib.boolToString withCryptsetup}" - "-Dportabled=false" + "-Dportabled=${lib.boolToString withPortabled}" "-Dhwdb=${lib.boolToString withHwdb}" "-Dremote=${lib.boolToString withRemote}" "-Dsysusers=false" |