Explicitly pass 'daemon' to determinate-nixd (#1159)

* flake.lock: Update determinate

Flake lock file updates:

• Updated input 'determinate':
    'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.89%2Brev-54bcee31752428b7a69200be76e7c357723ae2de/0191a4ff-ffd4-7774-abcf-bf93c97c71c8/source.tar.gz?narHash=sha256-hU7e8tuhxi3jQxJXsqaG%2BzhhNodV3oVzp9FxzOnuEbY%3D' (2024-08-30)
  → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.91%2Brev-ee1c24b52b7d1904308128ff8ed6a60f9bbd80c2/0191dca0-4394-7530-93a0-98db890817c6/source.tar.gz?narHash=sha256-bMU7IppWV7ir71xGbcyi20ifsD4sFwqHNMuYQtKfD%2Bo%3D' (2024-09-10)

* Explicitly pass 'daemon' to determinate-nixd

* fmt

* fixup: also specify daemon in systemd unit

---------

Co-authored-by: Cole Helbling <cole.helbling@determinate.systems>

src/action/common/configure_determinate_nixd_init_service/mod.rs

@@ -188,7 +188,7 @@ pub enum ConfigureDeterminateNixDaemonServiceError {}
 #[serde(rename_all = "PascalCase")]
 pub struct DeterminateNixDaemonPlist {
     label: String,
-    program: String,
+    program_arguments: Vec<String>,
     run_at_load: bool,
     sockets: HashMap<String, Socket>,
     standard_error_path: String,
@@ -223,7 +223,7 @@ fn generate_plist() -> DeterminateNixDaemonPlist {
     DeterminateNixDaemonPlist {
         run_at_load: false,
         label: "systems.determinate.nix-daemon".into(),
-        program: "/usr/local/bin/determinate-nixd".into(),
+        program_arguments: vec!["/usr/local/bin/determinate-nixd".into(), "daemon".into()],
         standard_error_path: "/var/log/determinate-nix-daemon.log".into(),
         standard_out_path: "/var/log/determinate-nix-daemon.log".into(),
         soft_resource_limits: ResourceLimits {

src/action/common/configure_determinate_nixd_init_service/nix-daemon.determinate-nixd.service

@@ -7,7 +7,7 @@ RequiresMountsFor=/nix/var/nix/db
 ConditionPathIsReadWrite=/nix/var/nix/daemon-socket
 
 [Service]
-ExecStart=@/usr/local/bin/determinate-nixd determinate-nixd
+ExecStart=@/usr/local/bin/determinate-nixd determinate-nixd daemon
 KillMode=process
 LimitNOFILE=1048576
 LimitSTACK=64M

src/action/macos/create_determinate_nix_volume.rs

@@ -219,7 +219,7 @@ impl Action for CreateDeterminateNixVolume {
             .map_err(Self::error)?;
 
         let mut command = Command::new("/usr/local/bin/determinate-nixd");
-        command.args(["--stop-after", "mount"]);
+        command.args(["--stop-after", "mount", "daemon"]);
         command.stderr(std::process::Stdio::piped());
         command.stdout(std::process::Stdio::piped());
         tracing::trace!(command = ?command.as_std(), "Mounting /nix");

src/action/macos/create_determinate_volume_service.rs

@@ -188,6 +188,7 @@ async fn generate_mount_plist(
             "/usr/local/bin/determinate-nixd".into(),
             "--stop-after".into(),
             "mount".into(),
+            "daemon".into(),
         ],
         standard_out_path: "/var/log/determinate-nixd-mount.log".into(),
         standard_error_path: "/var/log/determinate-nixd-mount.log".into(),