From 883d34031660a5ed1017c5c6285943becdc8d6c2 Mon Sep 17 00:00:00 2001
From: Raphael 'kena' Poss <knz@thaumogen.net>
Date: Mon, 5 Jul 2021 18:59:55 +0200
Subject: [PATCH] Fix unix builds

Note: this commit should not necessary as this has been
suitably fixed on the 'master' branch already.
However, the fixes are only available in 0.43.3 or later
and CockroachDB cannot upgrade to that version because of
https://github.com/cockroachdb/cockroach/pull/67221#issuecomment-874236134
and
https://github.com/bazelbuild/rules_go/issues/2479

So we're using this backport fix instead until that
other dependency management issue is resolved.
---
 internal/pkg/app/app_unix.go                                | 2 +-
 internal/pkg/app/appname/appname_test.go                    | 2 +-
 internal/pkg/filepathextended/filepathextended_unix_test.go | 2 +-
 internal/pkg/interrupt/interrupt_unix.go                    | 2 +-
 internal/pkg/netrc/netrc_unix.go                            | 2 +-
 internal/pkg/netrc/netrc_unix_test.go                       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/pkg/app/app_unix.go b/internal/pkg/app/app_unix.go
index 9cbc3362cf..a70e1ab627 100644
--- a/internal/pkg/app/app_unix.go
+++ b/internal/pkg/app/app_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package app
 
diff --git a/internal/pkg/app/appname/appname_test.go b/internal/pkg/app/appname/appname_test.go
index 06c5f97171..e5b51d69b8 100644
--- a/internal/pkg/app/appname/appname_test.go
+++ b/internal/pkg/app/appname/appname_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package appname
 
diff --git a/internal/pkg/filepathextended/filepathextended_unix_test.go b/internal/pkg/filepathextended/filepathextended_unix_test.go
index f0c514779e..19ee41922d 100644
--- a/internal/pkg/filepathextended/filepathextended_unix_test.go
+++ b/internal/pkg/filepathextended/filepathextended_unix_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package filepathextended
 
diff --git a/internal/pkg/interrupt/interrupt_unix.go b/internal/pkg/interrupt/interrupt_unix.go
index 48e8f837b2..c7a4df945c 100644
--- a/internal/pkg/interrupt/interrupt_unix.go
+++ b/internal/pkg/interrupt/interrupt_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package interrupt
 
diff --git a/internal/pkg/netrc/netrc_unix.go b/internal/pkg/netrc/netrc_unix.go
index 188c4b8b2f..0f360d0738 100644
--- a/internal/pkg/netrc/netrc_unix.go
+++ b/internal/pkg/netrc/netrc_unix.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package netrc
 
diff --git a/internal/pkg/netrc/netrc_unix_test.go b/internal/pkg/netrc/netrc_unix_test.go
index 841b429bf1..799a028f56 100644
--- a/internal/pkg/netrc/netrc_unix_test.go
+++ b/internal/pkg/netrc/netrc_unix_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin linux
+// +build !windows
 
 package netrc