nixos/systemd: link user-generators
This commit is contained in:
@@ -503,8 +503,8 @@ in
|
|||||||
environment.systemPackages = [ cfg.package ];
|
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/${scope}-${type} from attrset of links and packages
|
||||||
hooks = type: links: pkgs.runCommand "system-${type}" {
|
hooks = scope: type: links: pkgs.runCommand "${scope}-${type}" {
|
||||||
preferLocalBuild = true;
|
preferLocalBuild = true;
|
||||||
packages = cfg.packages;
|
packages = cfg.packages;
|
||||||
} ''
|
} ''
|
||||||
@@ -512,7 +512,7 @@ in
|
|||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
for package in $packages
|
for package in $packages
|
||||||
do
|
do
|
||||||
for hook in $package/lib/systemd/system-${type}/*
|
for hook in $package/lib/systemd/${scope}-${type}/*
|
||||||
do
|
do
|
||||||
ln -s $hook $out/
|
ln -s $hook $out/
|
||||||
done
|
done
|
||||||
@@ -562,8 +562,9 @@ in
|
|||||||
${cfg.sleep.extraConfig}
|
${cfg.sleep.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
"systemd/system-generators" = { source = hooks "generators" cfg.generators; };
|
"systemd/user-generators" = { source = hooks "user" "generators" cfg.user.generators; };
|
||||||
"systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; };
|
"systemd/system-generators" = { source = hooks "system" "generators" cfg.generators; };
|
||||||
|
"systemd/system-shutdown" = { source = hooks "system" "shutdown" cfg.shutdown; };
|
||||||
});
|
});
|
||||||
|
|
||||||
services.dbus.enable = true;
|
services.dbus.enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user