lua-language-server: use nixpkgs fmt
Currently experiencing issues with vendored fmt and nixpkgs clang. Using clang built fmt instead of vendored dependency.
This commit is contained in:
@@ -8,8 +8,7 @@
|
||||
makeWrapper,
|
||||
|
||||
# buildInputs
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
fmt,
|
||||
rsync,
|
||||
|
||||
versionCheckHook,
|
||||
@@ -33,12 +32,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# aligned_alloc
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.15")
|
||||
rsync
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
fmt
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
rsync
|
||||
];
|
||||
|
||||
env.NIX_LDFLAGS = "-lfmt";
|
||||
|
||||
postPatch =
|
||||
''
|
||||
@@ -47,6 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace 3rd/bee.lua/test/test.lua \
|
||||
--replace-fail 'require "test_filewatch"' ""
|
||||
|
||||
# use nixpkgs fmt library
|
||||
for d in 3rd/bee.lua 3rd/luamake/bee.lua
|
||||
do
|
||||
rm -r $d/3rd/fmt/*
|
||||
touch $d/3rd/fmt/format.cc
|
||||
substituteInPlace $d/bee/nonstd/format.h $d/bee/nonstd/print.h \
|
||||
--replace-fail "include <3rd/fmt/fmt" "include <fmt"
|
||||
done
|
||||
|
||||
# flaky tests on linux
|
||||
# https://github.com/LuaLS/lua-language-server/issues/2926
|
||||
substituteInPlace test/tclient/init.lua \
|
||||
|
||||
Reference in New Issue
Block a user