diff --git a/packages/skye-server-checks/configuration.nix b/packages/skye-server-checks/configuration.nix index a254dd33..9b4eefda 100644 --- a/packages/skye-server-checks/configuration.nix +++ b/packages/skye-server-checks/configuration.nix @@ -1,5 +1,5 @@ { - pkgs, + self', lib, config, ... @@ -16,12 +16,12 @@ config = let - package = (pkgs.callPackage ./default.nix { }); + package = self'.packages.skye-server-checks; in { environment.interactiveShellInit = '' - ${package}/bin/server-checks - ''; + ${lib.getExe package} + ''; environment.etc."/server-checks/checks.json".text = builtins.toJSON config.serverChecks; systemd.services.server-checks = { description = "Server monitoring daemon"; @@ -29,7 +29,7 @@ after = [ "network.target" ]; serviceConfig = { - ExecStart = "${package}/bin/server-checks agent"; + ExecStart = "${lib.getExe package} agent"; Restart = "always"; RestartSec = "60s"; User = "root"; diff --git a/packages/skye-server-checks/package.nix b/packages/skye-server-checks/package.nix index b6655acb..cb0c66eb 100644 --- a/packages/skye-server-checks/package.nix +++ b/packages/skye-server-checks/package.nix @@ -1,11 +1,13 @@ { - pkgs, - ... + lib, + rustPlatform, }: -pkgs.rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "server-checks"; version = "0.1"; - src = pkgs.lib.cleanSource ./.; + src = lib.cleanSource ./.; cargoLock.lockFile = ./Cargo.lock; + + meta.mainProgram = "server-checks"; }