public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104818 from flokli/systemd-with-portabled-mesonflags

Browse Source 
systemd: use withPortabled in mesonFlags
This commit is contained in:
Florian Klink 2020-11-25 00:58:50 +01:00 committed by GitHub
commit f55c180b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/os-specific/linux/systemd/default.nix
View File

@ -57,11 +57,12 @@
, withAnalyze ? true , withAnalyze ? true
, withApparmor ? true , withApparmor ? true
, withCoredump ? true
, withCompression ? true # adds bzip2, lz4 and xz , withCompression ? true # adds bzip2, lz4 and xz
, withCoredump ? true
, withCryptsetup ? true , withCryptsetup ? true
, withDocumentation ? true , withDocumentation ? true
, withEfi ? stdenv.hostPlatform.isEfi , withEfi ? stdenv.hostPlatform.isEfi
, withHomed ? false
, withHostnamed ? true , withHostnamed ? true
, withHwdb ? true , withHwdb ? true
, withImportd ? true , withImportd ? true
@ -72,14 +73,15 @@
, withNss ? true , withNss ? true
, withPCRE2 ? true , withPCRE2 ? true
, withPolkit ? true , withPolkit ? true
, withPortabled ? false
, withRemote ? true , withRemote ? true
, withResolved ? true , withResolved ? true
, withShellCompletions ? true , withShellCompletions ? true
, withTimedated ? true , withTimedated ? true
, withTimesyncd ? true , withTimesyncd ? true
, withUserDb ? true , withUserDb ? true
, withHomed ? false, p11-kit, libfido2 , p11-kit
# , withPortabled ? false TODO , libfido2
# name argument # name argument
, pname ? "systemd" , pname ? "systemd"
@ -94,7 +96,7 @@
assert withResolved -> (libgcrypt != null && libgpgerror != null); assert withResolved -> (libgcrypt != null && libgpgerror != null);
assert withImportd -> assert withImportd ->
(curl.dev != null && zlib != null && xz != null && libgcrypt != null (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 withEfi -> (gnu-efi != null);
assert withRemote -> lib.getDev curl != null; assert withRemote -> lib.getDev curl != null;
@ -104,7 +106,6 @@ assert withHomed -> withCryptsetup;
assert withCryptsetup -> assert withCryptsetup ->
(cryptsetup != null); (cryptsetup != null);
let let
wantCurl = withRemote || withImportd; wantCurl = withRemote || withImportd;
@ -196,20 +197,20 @@ stdenv.mkDerivation {
pam pam
] ]
++ lib.optional withApparmor libapparmor ++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl) ++ lib.optional wantCurl (lib.getDev curl)
++ lib.optionals withCompression [ bzip2 lz4 xz ] ++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi ++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools ++ lib.optional withKexectools kexectools
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables ++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2 ++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror ++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux ++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd ++ lib.optional withRemote libmicrohttpd
++ lib.optionals withHomed [ p11-kit libfido2 ] ++ lib.optionals withHomed [ p11-kit libfido2 ]
; ;
#dontAddPrefix = true; #dontAddPrefix = true;
@ -240,7 +241,7 @@ stdenv.mkDerivation {
"-Dnetworkd=${lib.boolToString withNetworkd}" "-Dnetworkd=${lib.boolToString withNetworkd}"
"-Dpolkit=${lib.boolToString withPolkit}" "-Dpolkit=${lib.boolToString withPolkit}"
"-Dcryptsetup=${lib.boolToString withCryptsetup}" "-Dcryptsetup=${lib.boolToString withCryptsetup}"
"-Dportabled=false" "-Dportabled=${lib.boolToString withPortabled}"
"-Dhwdb=${lib.boolToString withHwdb}" "-Dhwdb=${lib.boolToString withHwdb}"
"-Dremote=${lib.boolToString withRemote}" "-Dremote=${lib.boolToString withRemote}"
"-Dsysusers=false" "-Dsysusers=false"