diff --git a/nixproc/backends/synit/create-synit-daemon.nix b/nixproc/backends/synit/create-synit-daemon.nix index 70fffeb..b4c1710 100644 --- a/nixproc/backends/synit/create-synit-daemon.nix +++ b/nixproc/backends/synit/create-synit-daemon.nix @@ -1,6 +1,6 @@ { lib, writeTextFile, toPreserves }: -{ name, description, daemon, daemonArgs, environment, directory +{ name, description, argv, environment, directory # List of services that this configuration depends on. , dependencies ? [ ] # Daemon will not be started until all elements of depends-on are asserted. @@ -14,7 +14,7 @@ let # map (arg: ''"${lib.replaceStrings [ ''"'' ] [ ''\"'' ] (toString arg)}"''); processSpec = { - argv = [ daemon ] ++ daemonArgs; + inherit argv; env = environment; } // (lib.attrsets.optionalAttrs (directory != null) { dir = directory; }); diff --git a/nixproc/backends/synit/generate-synit-service.nix b/nixproc/backends/synit/generate-synit-service.nix index 4bb86c8..fa712f1 100644 --- a/nixproc/backends/synit/generate-synit-service.nix +++ b/nixproc/backends/synit/generate-synit-service.nix @@ -6,8 +6,12 @@ let generatedTargetSpecificArgs = { - inherit name description daemon daemonArgs environment directory - dependencies; + inherit name description environment directory dependencies; + + argv = if daemon != null then + [ daemon ] ++ daemonArgs + else + [ foregroundProcess ] ++ foregroundProcessArgs; }; targetSpecificArgs = if builtins.isFunction overrides then