systemd: set withRemote true by default

This also adds the libmicrohttpd as a `buildInput` when `withRemote` is true.
nlewo · Nov 2, 2020 · 859a44e · 859a44e
1 parent d64f4d0
commit 859a44e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
@@ -53,6 +53,7 @@
 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms
 , kexectools
 , bashInteractive
+, libmicrohttpd
 
 , withAnalyze ? true
 , withApparmor ? true
@@ -71,7 +72,7 @@
 , withNss ? true
 , withPCRE2 ? true
 , withPolkit ? true
-, withRemote ? false  # has always been disabled on NixOS, upstream version appears broken anyway
+, withRemote ? true
 , withResolved ? true
 , withShellCompletions ? true
 , withTimedated ? true
@@ -201,6 +202,7 @@ stdenv.mkDerivation {
     ++ lib.optional withPCRE2 pcre2
     ++ lib.optional withResolved libgpgerror
     ++ lib.optional withSelinux libselinux
+    ++ lib.optional withRemote libmicrohttpd
     ;
 
   #dontAddPrefix = true;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -18812,6 +18812,7 @@ in
     withNss = false;
     withPCRE2 = false;
     withPolkit = false;
+    withRemote = false;
     withResolved = false;
     withShellCompletions = false;
     withTimedated = false;