From c56a0e276024da1cc0fef4d85d3e866f1b8e1eb0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 May 2022 19:18:01 +0200
Subject: [PATCH] chore: simplify the .envrc loading

nix-shell pollutes the environment with all sorts of variables. Let's
just add the tools to the PATH?

This also papers over the various differences in users `use_nix`
implementations by not using it at all.

Change-Id: If4282531fd6b7453b3611fe50217beacadc08bb5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5524
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 .envrc               |  5 ++++-
 tools/depot-deps.nix | 47 +++++++++++++++++++-------------------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/.envrc b/.envrc
index a2f332887..dcd2a5654 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 c805746c8..180ffbd99 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-keycloak = {
-      attr = "ops.keycloak.terraform";
-      cmd = "terraform";
-    };
+  tf-glesys = {
+    attr = "ops.glesys.terraform";
+    cmd = "terraform";
+  };
+
+  tf-keycloak = {
+    attr = "ops.keycloak.terraform";
+    cmd = "terraform";
   };
-in
-pkgs.mkShell {
-  buildInputs = [
-    deps
-  ];
 }