From c56a0e276024da1cc0fef4d85d3e866f1b8e1eb0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 May 2022 19:18:01 +0200
Subject: 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 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.envrc')

diff --git a/.envrc b/.envrc
index a2f3328870..dcd2a56546 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
-- 
cgit 1.4.1