mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

Use QueueDirectories to wait for /nix/store for keepalived services

Browse source 
This allows to get rid of wait4path and sh from the execution path for
the services. Which simplifies permissions configuration for nix-daemon,
among other things. (No longer needed to grant Full Disk Access / App
Management to /bin/sh for nix-daemon to deal with .app bundles.)

Related: https://github.com/NixOS/nix/issues/6765

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
This commit is contained in:
Ihar Hrachyshka 2025-03-14 22:48:32 -04:00
parent adf5c88ba1
commit fc4e22f5d4
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/launchd/default.nix
View file

@ -79,19 +79,26 @@ let
}; };
}; };
config = { config = let
keepAlive = (config.serviceConfig.KeepAlive != false && config.serviceConfig.KeepAlive != null);
in {
command = mkIf (config.script != "") (pkgs.writeScript "${name}-start" '' command = mkIf (config.script != "") (pkgs.writeScript "${name}-start" ''
#! ${stdenv.shell} #! ${stdenv.shell}
${config.script} ${config.script}
''); '');
serviceConfig.QueueDirectories = mkIf keepAlive [ "/nix/store" ];
serviceConfig.Label = mkDefault "${cfg.labelPrefix}.${name}"; serviceConfig.Label = mkDefault "${cfg.labelPrefix}.${name}";
serviceConfig.ProgramArguments = mkIf (config.command != "") [ serviceConfig.ProgramArguments = mkIf (config.command != "") (
"/bin/sh" if keepAlive then [
"-c" "${config.command}"
"/bin/wait4path /nix/store &amp;&amp; exec ${config.command}" ] else [
]; "/bin/sh"
"-c"
"/bin/wait4path /nix/store &amp;&amp; exec ${config.command}"
]
);
serviceConfig.EnvironmentVariables = mkIf (env != {}) env; serviceConfig.EnvironmentVariables = mkIf (env != {}) env;
}; };
}; };

3
tests/autossh.nix
View file

@ -12,8 +12,7 @@
test = '' test = ''
plist=${config.out}/Library/LaunchDaemons/org.nixos.autossh-foo.plist plist=${config.out}/Library/LaunchDaemons/org.nixos.autossh-foo.plist
test -f $plist test -f $plist
grep '<string>/bin/wait4path /nix/store &amp;&amp; exec /nix/store/.*/bin/autossh ' $plist grep '<string>/nix/store/.*/bin/autossh.*-i /some/key' $plist
grep '<string>/bin/wait4path /nix/store &amp;&amp; exec.*-i /some/key ' $plist
tr -d '\n\t ' <$plist |grep '<key>KeepAlive</key><true */>' tr -d '\n\t ' <$plist |grep '<key>KeepAlive</key><true */>'
''; '';
} }

6
tests/services-lorri.nix
View file

@ -33,10 +33,8 @@ in
<service.json jq -e ".KeepAlive == true" <service.json jq -e ".KeepAlive == true"
<service.json jq -e ".Label == \"org.nixos.lorri\"" <service.json jq -e ".Label == \"org.nixos.lorri\""
<service.json jq -e ".ProcessType == \"Background\"" <service.json jq -e ".ProcessType == \"Background\""
<service.json jq -e ".ProgramArguments|length == 3" <service.json jq -e ".ProgramArguments|length == 1"
<service.json jq -e ".ProgramArguments[0] == \"/bin/sh\"" <service.json jq -e ".ProgramArguments[0] == \"${pkgs.lorri}/bin/lorri daemon\""
<service.json jq -e ".ProgramArguments[1] == \"-c\""
<service.json jq -e ".ProgramArguments[2] == \"/bin/wait4path /nix/store && exec ${pkgs.lorri}/bin/lorri daemon\""
<service.json jq -e ".RunAtLoad == true" <service.json jq -e ".RunAtLoad == true"
''; '';
} }

4
tests/services-nix-daemon.nix
View file

@ -14,9 +14,7 @@ in
test = '' test = ''
echo checking nix-daemon service in /Library/LaunchDaemons >&2 echo checking nix-daemon service in /Library/LaunchDaemons >&2
grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
grep "<string>/bin/wait4path" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist grep "${nix}/bin/nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
grep "&amp;&amp;" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
grep "exec ${nix}/bin/nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
grep "<key>KeepAlive</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist grep "<key>KeepAlive</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
(! grep "<key>Sockets</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist) (! grep "<key>Sockets</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist)