about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/run/.envrc1
-rw-r--r--tools/run/dir-locals.nix3
-rw-r--r--tools/run/shell.nix8
3 files changed, 8 insertions, 4 deletions
diff --git a/tools/run/.envrc b/tools/run/.envrc
index b80e28b4b815..1abb058f60d5 100644
--- a/tools/run/.envrc
+++ b/tools/run/.envrc
@@ -1,2 +1 @@
 source_up
-eval "$(lorri direnv)"
diff --git a/tools/run/dir-locals.nix b/tools/run/dir-locals.nix
new file mode 100644
index 000000000000..498f4b5055f8
--- /dev/null
+++ b/tools/run/dir-locals.nix
@@ -0,0 +1,3 @@
+let
+  briefcase = import <briefcase> {};
+in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/tools/run/shell.nix b/tools/run/shell.nix
index de192ae150c7..97d8ed61ec59 100644
--- a/tools/run/shell.nix
+++ b/tools/run/shell.nix
@@ -1,7 +1,9 @@
-{ pkgs, ... }:
-
-pkgs.mkShell {
+let
+  pkgs = import <nixpkgs> {};
+in pkgs.mkShell {
   buildInputs = with pkgs; [
     go
+    goimports
+    godef
   ];
 }