1
1
mirror of https://github.com/oxalica/nil.git synced 2024-10-27 12:30:52 +03:00

Fix flake and avoid name clash

This commit is contained in:
oxalica 2022-08-04 16:13:31 +08:00
parent bca921c5c0
commit 83e2d113dd
3 changed files with 9 additions and 5 deletions

View File

@ -46,7 +46,7 @@ lua <<EOF
require('lspconfig').rnix.setup { require('lspconfig').rnix.setup {
autostart = true, autostart = true,
-- Change it to the path to the `nil` binary you installed. -- Change it to the path to the `nil` binary you installed.
cmd = { "/run/current-system/sw/bin/bin/nil" }, cmd = { "/run/current-system/sw/bin/nil" },
} }
EOF EOF
``` ```

View File

@ -41,7 +41,7 @@
NIXPKGS = nixpkgs; NIXPKGS = nixpkgs;
shellHook = '' shellHook = ''
export NIL_PATH="$(cargo metadata --format-version=1 | jq -r .target_directory)" export NIL_PATH="$(cargo metadata --format-version=1 | jq -r .target_directory)/release/nil"
''; '';
}; };
}); });

View File

@ -1,11 +1,11 @@
# This file provides a configured neovim for debugging the LSP. # This file provides a configured neovim for debugging the LSP.
# Run `nvim` inside the shell to test. # Run `nvim-test` inside the shell to test.
# Env vars: # Env vars:
# - `NIL_PATH`: The path to "nil" LSP binary. Default: `target/debug/nil` # - `NIL_PATH`: The path to "nil" LSP binary. Default: `target/debug/nil`
# - `NIL_LOG_PATH`: Where to redirect LSP's stderr. Default: `/tmp/nil.log` # - `NIL_LOG_PATH`: Where to redirect LSP's stderr. Default: `/tmp/nil.log`
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
let let
neovim = pkgs.neovim.override { neovim = (pkgs.neovim.override {
withPython = false; withPython = false;
withRuby = false; withRuby = false;
@ -25,7 +25,11 @@ let
nvim-lspconfig nvim-lspconfig
]; ];
}; };
}; }).overrideAttrs (old: {
buildCommand = old.buildCommand + ''
mv $out/bin/nvim{,-test}
'';
});
# lua # lua
luaRc = '' luaRc = ''