alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #177048 from NixOS/packages-systemd

Browse source 
nixos/systemd: use cfg.package in systemPackages to avoid confusion
This commit is contained in:
Florian Klink 2022-06-12 10:20:51 +02:00 committed by GitHub
parent 298aee87ec 3df045e6d5
commit f9b0f5d09c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/systemd.nix
View file

@ -8,8 +8,6 @@ let
cfg = config.systemd; cfg = config.systemd;
systemd = cfg.package;
inherit (systemdUtils.lib) inherit (systemdUtils.lib)
generateUnits generateUnits
targetToUnit targetToUnit
@ -439,7 +437,7 @@ in
system.build.units = cfg.units; system.build.units = cfg.units;
system.nssModules = [ systemd.out ]; system.nssModules = [ cfg.package.out ];
system.nssDatabases = { system.nssDatabases = {
hosts = (mkMerge [ hosts = (mkMerge [
(mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd) (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd)
@ -453,7 +451,7 @@ in
]); ]);
}; };
environment.systemPackages = [ systemd ]; environment.systemPackages = [ cfg.package ];
environment.etc = let environment.etc = let
# generate contents for /etc/systemd/system-${type} from attrset of links and packages # generate contents for /etc/systemd/system-${type} from attrset of links and packages