From 8a46035a29f1921e60a794c8a5d009d019ade9c3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 26 Nov 2024 11:14:13 +0200
Subject: [PATCH 1/4] gopass-jsonapi: nixfmt; no with lib; in meta.

---
 pkgs/tools/security/gopass/jsonapi.nix | 29 ++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix
index 1c9abd08c80a..be5ec4f0f0f8 100644
--- a/pkgs/tools/security/gopass/jsonapi.nix
+++ b/pkgs/tools/security/gopass/jsonapi.nix
@@ -1,9 +1,10 @@
-{ lib
-, makeWrapper
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, gopass
+{
+  lib,
+  makeWrapper,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  gopass,
 }:
 
 buildGoModule rec {
@@ -21,10 +22,16 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  nativeBuildInputs = [ installShellFiles makeWrapper ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
 
   ldflags = [
-    "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}"
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.commit=${src.rev}"
   ];
 
   postFixup = ''
@@ -32,12 +39,12 @@ buildGoModule rec {
       --prefix PATH : "${gopass.wrapperPath}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Enables communication with gopass via JSON messages";
     homepage = "https://github.com/gopasspw/gopass-jsonapi";
     changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ maxhbr ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ maxhbr ];
     mainProgram = "gopass-jsonapi";
   };
 }

From 73bdf512abccfeb1c4526ef03d394193464fdf43 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 26 Nov 2024 11:16:07 +0200
Subject: [PATCH 2/4] gopass-jsonapi: add doronbehar as maintainer

---
 pkgs/tools/security/gopass/jsonapi.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix
index be5ec4f0f0f8..3b1373f1d565 100644
--- a/pkgs/tools/security/gopass/jsonapi.nix
+++ b/pkgs/tools/security/gopass/jsonapi.nix
@@ -44,7 +44,10 @@ buildGoModule rec {
     homepage = "https://github.com/gopasspw/gopass-jsonapi";
     changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ maxhbr ];
+    maintainers = with lib.maintainers; [
+      maxhbr
+      doronbehar
+    ];
     mainProgram = "gopass-jsonapi";
   };
 }

From 2fa59ab86bb5d4bb98631df1d00c46714f7b8e61 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 26 Nov 2024 11:14:48 +0200
Subject: [PATCH 3/4] gopass-jsonapi: move to pkgs/by-name

---
 .../jsonapi.nix => by-name/go/gopass-jsonapi/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/gopass/jsonapi.nix => by-name/go/gopass-jsonapi/package.nix} (100%)

diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
similarity index 100%
rename from pkgs/tools/security/gopass/jsonapi.nix
rename to pkgs/by-name/go/gopass-jsonapi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98a076259d50..307b5d0330de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1907,8 +1907,6 @@ with pkgs;
 
   gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
 
-  gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
-
   git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
 
   gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };

From 4ca369a023de28575b42f6b282d57a02ca79d8cd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 24 Nov 2024 18:34:38 +0200
Subject: [PATCH 4/4] gopass-jsonapi: 1.15.14 -> 1.15.15

Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.14...v1.15.15

Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/CHANGELOG.md
---
 pkgs/by-name/go/gopass-jsonapi/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index 3b1373f1d565..5a3ad29f431d 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -1,24 +1,26 @@
 {
   lib,
+  stdenv,
   makeWrapper,
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
   gopass,
+  apple-sdk_14,
 }:
 
 buildGoModule rec {
   pname = "gopass-jsonapi";
-  version = "1.15.14";
+  version = "1.15.15";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
     rev = "v${version}";
-    hash = "sha256-DbfmjgIUqgWVYyPqkcaeE5JKzqElNbrGnx62Fd8v7Hg=";
+    hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI=";
   };
 
-  vendorHash = "sha256-Aahu0afi6bPnvz/NSZznbp0y9vMJWDj1Bq7tWGRmm7g=";
+  vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs=";
 
   subPackages = [ "." ];
 
@@ -27,6 +29,11 @@ buildGoModule rec {
     makeWrapper
   ];
 
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
+    apple-sdk_14
+  ];
+
   ldflags = [
     "-s"
     "-w"