From 75229f7d189fe1ef924e25ba4c087d27552770d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Mon, 7 Nov 2022 13:57:06 +1100
Subject: [PATCH 1/2] esbuild_netlify: fix darwin build

---
 pkgs/development/tools/esbuild/netlify.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix
index efd5b917e9cd..939458892f04 100644
--- a/pkgs/development/tools/esbuild/netlify.nix
+++ b/pkgs/development/tools/esbuild/netlify.nix
@@ -1,4 +1,8 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
 
 buildGoModule rec {
   pname = "esbuild";
@@ -11,7 +15,19 @@ buildGoModule rec {
     sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9";
   };
 
-  vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+  vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+
+  patches = [
+    # Both upstream patches update the same dependency "x/sys". It's required for darwin compatibility.
+    (fetchpatch {
+      url = "https://github.com/evanw/esbuild/commit/2567e099fcc6959e630f100b2c737ca80e88ba82.patch";
+      hash = "sha256-KdX/Ru9TBX0mSDaS1ijxgzDI+2AoCvt6Wilhpca3VC0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/evanw/esbuild/commit/fd13718c6195afb9e63682476a774fa6d4483be0.patch";
+      hash = "sha256-va/bXRBQf9qgE9LZXcKKAa0ZpMt/QG7BFClJ8bPWG1Y=";
+    })
+  ];
 
   meta = with lib; {
     description = "A fork of esbuild maintained by netlify";

From b234d4f06d75dc2ac2caafb6e3be83d940715a96 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Nov 2022 13:05:07 +0100
Subject: [PATCH 2/2] esbuild_netlify: Add netlify-cli to tests

---
 pkgs/development/tools/esbuild/netlify.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix
index 939458892f04..6520c53dd1f4 100644
--- a/pkgs/development/tools/esbuild/netlify.nix
+++ b/pkgs/development/tools/esbuild/netlify.nix
@@ -2,6 +2,7 @@
 , buildGoModule
 , fetchFromGitHub
 , fetchpatch
+, netlify-cli
 }:
 
 buildGoModule rec {
@@ -29,6 +30,12 @@ buildGoModule rec {
     })
   ];
 
+  passthru = {
+    tests = {
+      inherit netlify-cli;
+    };
+  };
+
   meta = with lib; {
     description = "A fork of esbuild maintained by netlify";
     homepage = "https://github.com/netlify/esbuild";