From 45d7127c77df7e6fbb61939dc76f466c66c6700a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Sep 2024 02:22:19 +0000
Subject: [PATCH 1/2] mesonlsp: 4.3.5 -> 4.3.7

---
 pkgs/by-name/me/mesonlsp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index e1e0a3b771c1..494624b142f6 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mesonlsp";
-  version = "4.3.5";
+  version = "4.3.7";
 
   src = fetchFromGitHub {
     owner = "JCWasmx86";
     repo = "mesonlsp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs=";
+    hash = "sha256-QhZv4PTcf1jzSOcp1+bPZWf5COugCIMq1zkhc0PJjUQ=";
   };
 
   patches = [ ./disable-tests-that-require-network-access.patch ];

From 02871d95ebeb1ad52f68a69dc86d1736aab1fb21 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 9 Nov 2024 00:23:35 +0100
Subject: [PATCH 2/2] mesonlsp: fix aarch64-darwin build, mark as broken on
 x86_64-darwin

---
 pkgs/by-name/me/mesonlsp/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix
index 494624b142f6..bd8c30791060 100644
--- a/pkgs/by-name/me/mesonlsp/package.nix
+++ b/pkgs/by-name/me/mesonlsp/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  llvmPackages_19,
   fetchFromGitHub,
 
   gtest,
@@ -23,7 +24,10 @@
   testers,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+let
+  stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
   pname = "mesonlsp";
   version = "4.3.7";
 
@@ -163,5 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "mesonlsp";
     maintainers = with maintainers; [ paveloom ];
     platforms = platforms.unix;
+    # ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 })