summary refs log tree commit diff
path: root/nixos/modules/system/boot
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2018-05-26 16:49:08 -0700
committerAneesh Agrawal <aneeshusa@gmail.com>2018-06-13 22:55:06 -0700
commit76c4c7b9de8930d82af8064d2abde5f3b492cb0a (patch)
tree0c1128b3a1dc7e33bf0928405a146c37f7a28634 /nixos/modules/system/boot
parent3e3a9e661d7ef83f9dfc26d948a12f8ee1334f6d (diff)
downloadnixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar.gz
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar.bz2
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar.lz
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar.xz
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.tar.zst
nixlib-76c4c7b9de8930d82af8064d2abde5f3b492cb0a.zip
nixos/systemd: Allow building systemd without libmicrohttpd
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r--nixos/modules/system/boot/systemd.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d2fe33488a7a..2a4f57fc90b6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -70,8 +70,6 @@ let
       "systemd-journald.socket"
       "systemd-journald.service"
       "systemd-journal-flush.service"
-      "systemd-journal-gatewayd.socket"
-      "systemd-journal-gatewayd.service"
       "systemd-journal-catalog-update.service"
       "systemd-journald-audit.socket"
       "systemd-journald-dev-log.socket"
@@ -160,8 +158,10 @@ let
       "systemd-binfmt.service"
       "systemd-exit.service"
       "systemd-update-done.service"
-    ]
-    ++ cfg.additionalUpstreamSystemUnits;
+    ] ++ optionals config.services.journald.enableHttpGateway [
+      "systemd-journal-gatewayd.socket"
+      "systemd-journal-gatewayd.service"
+    ] ++ cfg.additionalUpstreamSystemUnits;
 
   upstreamSystemWants =
     [ "sysinit.target.wants"