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

Merge pull request #41970 from aneeshusa/enable-building-systemd-without-libmicrohttpd

Browse Source 
nixos/systemd: Allow building systemd without libmicrohttpd
This commit is contained in:
Matthew Bauer 2018-07-23 11:24:14 -04:00 committed by GitHub
commit ca0522a842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/system/boot/systemd.nix
View File

@ -70,8 +70,6 @@ let
"systemd-journald.socket" "systemd-journald.socket"
"systemd-journald.service" "systemd-journald.service"
"systemd-journal-flush.service" "systemd-journal-flush.service"
"systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
"systemd-journal-catalog-update.service" "systemd-journal-catalog-update.service"
"systemd-journald-audit.socket" "systemd-journald-audit.socket"
"systemd-journald-dev-log.socket" "systemd-journald-dev-log.socket"
@ -160,8 +158,10 @@ let
"systemd-binfmt.service" "systemd-binfmt.service"
"systemd-exit.service" "systemd-exit.service"
"systemd-update-done.service" "systemd-update-done.service"
] ] ++ optionals config.services.journald.enableHttpGateway [
++ cfg.additionalUpstreamSystemUnits; "systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
] ++ cfg.additionalUpstreamSystemUnits;
upstreamSystemWants = upstreamSystemWants =
[ "sysinit.target.wants" [ "sysinit.target.wants"