From 2651a36d3cd56cfcdb88bae59efe8cd33366f991 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Sat, 1 Jun 2024 15:18:11 +0200
Subject: [PATCH] Fix pinentry

---
 cli/agent/systemauth/pinentry/go-pinentry.go      | 10 ++++++++--
 cli/agent/systemauth/pinentry/keybase-pinentry.go |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cli/agent/systemauth/pinentry/go-pinentry.go b/cli/agent/systemauth/pinentry/go-pinentry.go
index 673950a..648a7e3 100644
--- a/cli/agent/systemauth/pinentry/go-pinentry.go
+++ b/cli/agent/systemauth/pinentry/go-pinentry.go
@@ -1,16 +1,22 @@
-//go:build freebsd || linux
+//go:build freebsd || linux || darwin
 
 package pinentry
 
 import (
 	"errors"
+	"runtime"
 
 	"github.com/twpayne/go-pinentry"
 )
 
 func getPassword(title string, description string) (string, error) {
+	binaryClientOption := pinentry.WithBinaryNameFromGnuPGAgentConf()
+	if runtime.GOOS == "darwin" {
+		binaryClientOption = pinentry.WithBinaryName("pinentry-mac")
+	}
+
 	client, err := pinentry.NewClient(
-		pinentry.WithBinaryNameFromGnuPGAgentConf(),
+		binaryClientOption,
 		pinentry.WithGPGTTY(),
 		pinentry.WithTitle(title),
 		pinentry.WithDesc(description),
diff --git a/cli/agent/systemauth/pinentry/keybase-pinentry.go b/cli/agent/systemauth/pinentry/keybase-pinentry.go
index 0071fdd..a3486de 100644
--- a/cli/agent/systemauth/pinentry/keybase-pinentry.go
+++ b/cli/agent/systemauth/pinentry/keybase-pinentry.go
@@ -1,4 +1,4 @@
-//go:build windows || darwin
+//go:build windows
 
 package pinentry