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

nixos/systemd: use cfg.package in systemPackages to avoid confusion

Browse Source
This commit is contained in:
Sandro Jäckel 2022-06-09 17:28:13 +02:00
parent 033bd4fa9a
commit 3df045e6d5
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
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;
systemd = cfg.package;
inherit (systemdUtils.lib)
generateUnits
targetToUnit
@ -439,7 +437,7 @@ in
system.build.units = cfg.units;
system.nssModules = [ systemd.out ];
system.nssModules = [ cfg.package.out ];
system.nssDatabases = {
hosts = (mkMerge [
(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
# generate contents for /etc/systemd/system-${type} from attrset of links and packages