From 2b74ba3ed7c7c38893d1dccf0ca4db5be3f0f738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 17 Jun 2022 13:23:31 +0200
Subject: [PATCH 1/2] vimPlugins.vim-go: move comment to right place

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 54a32de66409..5977a2d6ece0 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1031,7 +1031,7 @@ self: super: {
         delve
         errcheck
         go-motion
-        go-tools
+        go-tools # contains staticcheck
         gocode
         gocode-gomod
         godef
@@ -1041,7 +1041,8 @@ self: super: {
         gomodifytags
         gopls
         # gorename
-        gotools # contains staticcheck
+        # gotags
+        gotools
         # guru
         iferr
         impl

From 8a2e36cc53fc1e6de663bfd4cfcf3dc9f1b3a21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Fri, 17 Jun 2022 13:28:45 +0200
Subject: [PATCH 2/2] vimPlugins.vim-go: simplify postPatch

gnused is part of the stdenv
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 5977a2d6ece0..a9d89a4f1ed6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1053,9 +1053,7 @@ self: super: {
     in
     {
       postPatch = ''
-        ${gnused}/bin/sed \
-          -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g' \
-          -i autoload/go/config.vim
+        sed -i autoload/go/config.vim -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g'
       '';
     });