summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/default.nix
diff options
context:
space:
mode:
authorAntoine Eiche <lewo@abesis.fr>2020-11-01 18:47:18 +0100
committerAntoine Eiche <lewo@abesis.fr>2020-11-02 09:07:52 +0100
commit859a44ebc0b4f54c8053884c9bf1d8496ada0bf8 (patch)
tree7ac71a9af33b96f7bbba8307d9e013a50913b78b /pkgs/os-specific/linux/systemd/default.nix
parentd64f4d03d5575abe54718e3cbfda5d8518818d04 (diff)
downloadnixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar.gz
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar.bz2
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar.lz
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar.xz
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.tar.zst
nixpkgs-859a44ebc0b4f54c8053884c9bf1d8496ada0bf8.zip
systemd: set withRemote true by default
This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 8aaeddd1e81..0a89fe3720a 100644
--- 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;