From c2ec59d1cbb7e69d9fe6dfc1c12509d2fe66cc4e Mon Sep 17 00:00:00 2001 From: dadada Date: Wed, 24 Aug 2022 00:27:46 +0200 Subject: [PATCH] fix path to deploy in apps --- apps.nix | 8 ++++++-- outputs.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps.nix b/apps.nix index 94a2049..fc725e3 100644 --- a/apps.nix +++ b/apps.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: +{ pkgs +, deploy-rs +, system +, ... +}: { nixos-switch = { type = "app"; @@ -14,7 +18,7 @@ program = toString (pkgs.writeScript "self-deploy" '' #!${pkgs.runtimeShell} flake=$(nix flake metadata --json ${./.} | jq -r .url) - deploy ''${flake} + ${deploy-rs.apps."${system}".deploy-rs.program} ''${flake} ''); }; } diff --git a/outputs.nix b/outputs.nix index c7965e2..cf41357 100644 --- a/outputs.nix +++ b/outputs.nix @@ -20,7 +20,7 @@ formatter = self.formatter.${system}; in { - apps = import ./apps.nix { inherit pkgs; }; + apps = import ./apps.nix (inputs // { inherit pkgs system; }); devShells.default = pkgs.callPackage ./dev-shell.nix inputs // { inherit pkgs system; };