Skip to content

Commit 0dc5bb1

Browse files
authored
mesonlsp: 4.3.5 -> 4.3.7 (#345407)
2 parents e3d5090 + 02871d9 commit 0dc5bb1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

pkgs/by-name/me/mesonlsp/package.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
lib,
33
stdenv,
4+
llvmPackages_19,
45
fetchFromGitHub,
56

67
gtest,
@@ -23,15 +24,18 @@
2324
testers,
2425
}:
2526

26-
stdenv.mkDerivation (finalAttrs: {
27+
let
28+
stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
29+
in
30+
stdenv'.mkDerivation (finalAttrs: {
2731
pname = "mesonlsp";
28-
version = "4.3.5";
32+
version = "4.3.7";
2933

3034
src = fetchFromGitHub {
3135
owner = "JCWasmx86";
3236
repo = "mesonlsp";
3337
rev = "v${finalAttrs.version}";
34-
hash = "sha256-E2XKnvARq45AjAc0iBVyb2ssNyJOUye4MWOofZV2ahs=";
38+
hash = "sha256-QhZv4PTcf1jzSOcp1+bPZWf5COugCIMq1zkhc0PJjUQ=";
3539
};
3640

3741
patches = [ ./disable-tests-that-require-network-access.patch ];
@@ -163,5 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
163167
mainProgram = "mesonlsp";
164168
maintainers = with maintainers; [ paveloom ];
165169
platforms = platforms.unix;
170+
# ../src/liblog/log.cpp:41:7: error: call to 'format' is ambiguous
171+
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
166172
};
167173
})

0 commit comments

Comments
 (0)