Merge pull request #327 from mrcjkb/lua-ls-shellhook-fix

fix(lua-ls): update + shell hook
cachix · Jul 17, 2023 · 87589fa · 87589fa
2 parents 5e28316 + 09214ad
commit 87589fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/modules/hooks.nix b/modules/hooks.nix
@@ -662,19 +662,27 @@ in
         };
       lua-ls =
         let
+          # .luarc.json has to be in a directory,
+          # or lua-language-server will hang forever.
           luarc = pkgs.writeText ".luarc.json" (builtins.toJSON settings.lua-ls.config);
+          luarc-dir = pkgs.stdenv.mkDerivation {
+            name = "luarc";
+            unpackPhase = "true";
+            installPhase = ''
+              mkdir $out
+              cp ${luarc} $out/.luarc.json
+            '';
+          };
           script = pkgs.writeShellApplication {
             name = "lua-ls-lint";
             runtimeInputs = [ tools.lua-language-server ];
             checkPhase = ""; # The default checkPhase depends on GHC
             text = ''
               set -e
               export logpath="$(mktemp -d)"
-              # For some reason, lua-language-server hangs if the nix store path to the file is passed in directly
-              cp "${luarc}" .luarc.json
               lua-language-server --check $(realpath .) \
                 --checklevel="${settings.lua-ls.checklevel}" \
-                --configpath=$(realpath .luarc.json) \
+                --configpath="${luarc-dir}/.luarc.json" \
                 --logpath="$logpath"
               if [[ -f $logpath/check.json ]]; then
                 echo "+++++++++++++++ lua-language-server diagnostics +++++++++++++++"

diff --git a/nix/tools.nix b/nix/tools.nix
@@ -31,7 +31,7 @@
 , html-tidy
 , hunspell
 , luaPackages
-, sumneko-lua-language-server
+, lua-language-server
 , mdsh
 , nil
 , nixfmt
@@ -119,7 +119,7 @@ in
   inherit (luaPackages) luacheck;
   inherit (nodePackages) eslint markdownlint-cli prettier cspell;
   inherit (ocamlPackages) ocp-indent;
-  lua-language-server = sumneko-lua-language-server;
+  lua-language-server = lua-language-server;
   purs-tidy = nodePackages.purs-tidy or null;
   cabal2nix-dir = callPackage ./cabal2nix-dir { };
   hpack-dir = callPackage ./hpack-dir { };