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

nixos/systemd: simplify hooks function

Browse Source
This commit is contained in:
Dawid Dziurla
2024-06-03 11:15:59 +02:00
parent 0133e21626
commit fbbc41f7da
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/systemd.nix
+6 -6
View File
@@ -503,8 +503,8 @@ in
environment.systemPackages = [ cfg.package ];
environment.etc = let
# generate contents for /etc/systemd/${scope}-${type} from attrset of links and packages
hooks = scope: type: links: pkgs.runCommand "${scope}-${type}" {
# generate contents for /etc/systemd/${dir} from attrset of links and packages
hooks = dir: links: pkgs.runCommand "${dir}" {
preferLocalBuild = true;
packages = cfg.packages;
} ''
@@ -512,7 +512,7 @@ in
mkdir -p $out
for package in $packages
do
for hook in $package/lib/systemd/${scope}-${type}/*
for hook in $package/lib/systemd/${dir}/*
do
ln -s $hook $out/
done
@@ -562,9 +562,9 @@ in
${cfg.sleep.extraConfig}
'';
"systemd/user-generators" = { source = hooks "user" "generators" cfg.user.generators; };
"systemd/system-generators" = { source = hooks "system" "generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "system" "shutdown" cfg.shutdown; };
"systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; };
"systemd/system-generators" = { source = hooks "system-generators" cfg.generators; };
"systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; };
});
services.dbus.enable = true;