From d195f794b88df6f15159b141b3fad73fe17872d7 Mon Sep 17 00:00:00 2001
From: Brian McGee <brian@bmcgee.ie>
Date: Mon, 7 Oct 2024 14:04:21 +0100
Subject: [PATCH] feat: simplify devshell

Signed-off-by: Brian McGee <brian@bmcgee.ie>
---
 nix/devshells/default.nix | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/nix/devshells/default.nix b/nix/devshells/default.nix
index f9034d8f..d6f52080 100644
--- a/nix/devshells/default.nix
+++ b/nix/devshells/default.nix
@@ -3,17 +3,12 @@
   perSystem,
   ...
 }:
-perSystem.self.treefmt.overrideAttrs (old: {
-  GOROOT = "${old.go}/share/go";
+pkgs.mkShellNoCC {
+  env.GOROOT = "${pkgs.go}/share/go";
 
-  shellHook = ''
-    # this is only needed for hermetic builds
-    unset GO_NO_VENDOR_CHECKS GOSUMDB GOPROXY GOFLAGS
-  '';
-
-  nativeBuildInputs =
-    old.nativeBuildInputs
-    ++ (with pkgs; [
+  packages =
+    (with pkgs; [
+      go
       goreleaser
       golangci-lint
       delve
@@ -23,7 +18,6 @@ perSystem.self.treefmt.overrideAttrs (old: {
       enumer
       perSystem.gomod2nix.default
     ])
-    ++
-    # include formatters for development and testing
+    ++ # include formatters for development and testing
     (import ../packages/treefmt/formatters.nix pkgs);
-})
+}