diff options
| -rw-r--r-- | .envrc | 5 | ||||
| -rw-r--r-- | tools/depot-deps.nix | 45 |
2 files changed, 23 insertions, 27 deletions
diff --git a/.envrc b/.envrc index a2f332887060..dcd2a5654668 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,7 @@ # Configure the local PATH to contain tools which are fetched ad-hoc # from Nix. -use nix -A tools.depot-deps + +out=$(nix-build -A tools.depot-deps --no-out-link) +PATH_add "$out" + watch_file tools/depot-deps.nix diff --git a/tools/depot-deps.nix b/tools/depot-deps.nix index c805746c8971..180ffbd99f94 100644 --- a/tools/depot-deps.nix +++ b/tools/depot-deps.nix @@ -2,33 +2,26 @@ # that should be lazily made available in depot. { pkgs, depot, ... }: -let - deps = depot.nix.lazy-deps { - age-keygen.attr = "third_party.nixpkgs.age"; - age.attr = "third_party.nixpkgs.age"; - depotfmt.attr = "tools.depotfmt"; - gerrit-update.attr = "tools.gerrit-update"; - gerrit.attr = "tools.gerrit-cli"; - hash-password.attr = "tools.hash-password"; - mg.attr = "tools.magrathea"; - nint.attr = "nix.nint"; - niv.attr = "third_party.nixpkgs.niv"; - rebuild-system.attr = "ops.nixos.rebuildSystem"; - rink.attr = "third_party.nixpkgs.rink"; +depot.nix.lazy-deps { + age-keygen.attr = "third_party.nixpkgs.age"; + age.attr = "third_party.nixpkgs.age"; + depotfmt.attr = "tools.depotfmt"; + gerrit-update.attr = "tools.gerrit-update"; + gerrit.attr = "tools.gerrit-cli"; + hash-password.attr = "tools.hash-password"; + mg.attr = "tools.magrathea"; + nint.attr = "nix.nint"; + niv.attr = "third_party.nixpkgs.niv"; + rebuild-system.attr = "ops.nixos.rebuildSystem"; + rink.attr = "third_party.nixpkgs.rink"; - tf-glesys = { - attr = "ops.glesys.terraform"; - cmd = "terraform"; - }; + tf-glesys = { + attr = "ops.glesys.terraform"; + cmd = "terraform"; + }; - tf-keycloak = { - attr = "ops.keycloak.terraform"; - cmd = "terraform"; - }; + tf-keycloak = { + attr = "ops.keycloak.terraform"; + cmd = "terraform"; }; -in -pkgs.mkShell { - buildInputs = [ - deps - ]; } |