From 2a09cdf753cf411f7e34d8775900441ad35fd624 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 25 Dec 2024 22:19:14 -0600 Subject: [PATCH] lua-language-server: use nixpkgs fmt Currently experiencing issues with vendored fmt and nixpkgs clang. Using clang built fmt instead of vendored dependency. --- .../lu/lua-language-server/package.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index 3f9af92410de..c861eb855584 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -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