diff --git a/nix/devshell.nix b/nix/devshell.nix index bbd7607a..89ffadf9 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -2,72 +2,62 @@ pkgs, perSystem, ... -}: let - inherit (pkgs) lib; - inherit (pkgs.stdenv) isLinux isDarwin; -in - perSystem.devshell.mkShell { - env = [ - { - name = "GOROOT"; - value = pkgs.go + "/share/go"; - } - { - name = "LD_LIBRARY_PATH"; - value = "$DEVSHELL_DIR/lib"; - } - ]; +}: +perSystem.devshell.mkShell { + env = [ + { + name = "GOROOT"; + value = pkgs.go + "/share/go"; + } + ]; - packages = lib.mkMerge [ - (with pkgs; [ - # golang - go - goreleaser - golangci-lint - delve - pprof - graphviz + packages = pkgs.lib.mkMerge [ + (with pkgs; [ + # golang + go + goreleaser + golangci-lint + delve + pprof + graphviz - # docs - nodejs - ]) - # platform dependent CGO dependencies - (lib.mkIf isLinux [pkgs.gcc]) - (lib.mkIf isDarwin [pkgs.darwin.cctools]) - # include formatters for development and testing - (import ./packages/treefmt/formatters.nix pkgs) - ]; + # docs + nodejs + ]) + # include formatters for development and testing + (import ./packages/treefmt/formatters.nix pkgs) + ]; - commands = [ - {package = perSystem.gomod2nix.default;} - { - name = "docs:dev"; - help = "serve docs for local development"; - command = "cd $PRJ_ROOT/docs && npm ci && npm run dev"; - } - { - name = "docs:build"; - help = "create a production build of docs"; - command = "cd $PRJ_ROOT/docs && npm ci && npm run build"; - } - { - name = "docs:preview"; - help = "preview a production build of docs"; - command = "cd $PRJ_ROOT/docs && npm ci && npm run preview"; - } - { - help = "generate terminal gifs"; - package = pkgs.writeShellApplication { - name = "vhs"; - runtimeInputs = - [ - perSystem.self.treefmt - pkgs.rsync - pkgs.vhs - ] - ++ (import ./packages/treefmt/formatters.nix pkgs); - text = ''vhs "$@"''; - }; - } - ]; - } + commands = [ + {package = perSystem.gomod2nix.default;} + { + name = "docs:dev"; + help = "serve docs for local development"; + command = "cd $PRJ_ROOT/docs && npm ci && npm run dev"; + } + { + name = "docs:build"; + help = "create a production build of docs"; + command = "cd $PRJ_ROOT/docs && npm ci && npm run build"; + } + { + name = "docs:preview"; + help = "preview a production build of docs"; + command = "cd $PRJ_ROOT/docs && npm ci && npm run preview"; + } + { + help = "generate terminal gifs"; + package = pkgs.writeShellApplication { + name = "vhs"; + runtimeInputs = + [ + perSystem.self.treefmt + pkgs.rsync + pkgs.vhs + ] + ++ (import ./packages/treefmt/formatters.nix pkgs); + text = ''vhs "$@"''; + }; + } + ]; +} diff --git a/nix/packages/treefmt/default.nix b/nix/packages/treefmt/default.nix index ea23d1f8..4092e680 100644 --- a/nix/packages/treefmt/default.nix +++ b/nix/packages/treefmt/default.nix @@ -37,7 +37,7 @@ in modules = ./gomod2nix.toml; - CGO_ENABLED = 1; + CGO_ENABLED = 0; ldflags = [ "-s"