diff options
Diffstat (limited to 'go')
| -rw-r--r-- | go/.envrc | 1 | ||||
| -rw-r--r-- | go/dir-locals.nix | 3 | ||||
| -rw-r--r-- | go/shell.nix | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/go/.envrc b/go/.envrc index 1abb058f60d5..a4a62da526d3 100644 --- a/go/.envrc +++ b/go/.envrc @@ -1 +1,2 @@ source_up +use_nix diff --git a/go/dir-locals.nix b/go/dir-locals.nix deleted file mode 100644 index 498f4b5055f8..000000000000 --- a/go/dir-locals.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - briefcase = import <briefcase> {}; -in briefcase.utils.nixBufferFromShell ./shell.nix diff --git a/go/shell.nix b/go/shell.nix index aab4123bff9a..e14bffae487c 100644 --- a/go/shell.nix +++ b/go/shell.nix @@ -1,9 +1,10 @@ let - pkgs = import <nixpkgs> {}; + briefcase = import <briefcase> {}; + pkgs = briefcase.third_party.pkgs; in pkgs.mkShell { - buildInputs = [ - pkgs.go - pkgs.goimports - pkgs.godef + buildInputs = with pkgs; [ + go + goimports + godef ]; } |