systemd: set withRemote true by default

This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
This commit is contained in:
Antoine Eiche 2020-11-01 18:47:18 +01:00
parent d64f4d03d5
commit 859a44ebc0
2 changed files with 4 additions and 1 deletions

View File

@ -53,6 +53,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms
, kexectools , kexectools
, bashInteractive , bashInteractive
, libmicrohttpd
, withAnalyze ? true , withAnalyze ? true
, withApparmor ? true , withApparmor ? true
@ -71,7 +72,7 @@
, withNss ? true , withNss ? true
, withPCRE2 ? true , withPCRE2 ? true
, withPolkit ? true , withPolkit ? true
, withRemote ? false # has always been disabled on NixOS, upstream version appears broken anyway , withRemote ? true
, withResolved ? true , withResolved ? true
, withShellCompletions ? true , withShellCompletions ? true
, withTimedated ? true , withTimedated ? true
@ -201,6 +202,7 @@ stdenv.mkDerivation {
++ 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
; ;
#dontAddPrefix = true; #dontAddPrefix = true;

View File

@ -18812,6 +18812,7 @@ in
withNss = false; withNss = false;
withPCRE2 = false; withPCRE2 = false;
withPolkit = false; withPolkit = false;
withRemote = false;
withResolved = false; withResolved = false;
withShellCompletions = false; withShellCompletions = false;
withTimedated = false; withTimedated = false;