diff options
Diffstat (limited to 'contrib/flake.nix')
| -rw-r--r-- | contrib/flake.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/contrib/flake.nix b/contrib/flake.nix index 8df1768827..68793f6823 100644 --- a/contrib/flake.nix +++ b/contrib/flake.nix @@ -8,15 +8,11 @@ outputs = { self, nixpkgs, flake-utils }: { - overlay = final: prev: rec { + overlay = final: prev: { neovim = final.neovim-unwrapped.overrideAttrs (oa: { version = "master"; src = ../.; - - buildInputs = oa.buildInputs - ++ final.lib.optionals final.stdenv.isDarwin - (with final.darwin.apple_sdk.frameworks; [ CoreServices ]); }); # a development binary to help debug issues @@ -25,7 +21,7 @@ final.llvmPackages_latest.stdenv else final.stdenv; - in ((neovim.override { + in (final.neovim.override { lua = final.luajit; inherit stdenv; }).overrideAttrs (oa: { @@ -37,13 +33,13 @@ cmakeFlags = oa.cmakeFlags ++ [ "-DMIN_LOG_LEVEL=0" ]; disallowedReferences = [ ]; - })); + }); # for neovim developers, beware of the slow binary - neovim-developer = let luacheck = final.luaPackages.luacheck; - in (neovim-debug.override ({ + neovim-developer = let inherit (final.luaPackages) luacheck; + in (final.neovim-debug.override { doCheck = final.stdenv.isLinux; - })).overrideAttrs (oa: { + }).overrideAttrs (oa: { cmakeFlags = oa.cmakeFlags ++ [ "-DLUACHECK_PRG=${luacheck}/bin/luacheck" "-DMIN_LOG_LEVEL=0" @@ -113,15 +109,10 @@ # ASAN_OPTIONS=detect_leaks=1 export ASAN_OPTIONS="log_path=./test.log:abort_on_error=1" export UBSAN_OPTIONS=print_stacktrace=1 - mkdir -p build/runtime/parser - # nvim looks into CMAKE_INSTALL_DIR. Hack to avoid errors - # when running the functionaltests - mkdir -p outputs/out/share/nvim/syntax - touch outputs/out/share/nvim/syntax/syntax.vim # for treesitter functionaltests mkdir -p runtime/parser - cp -f ${pkgs.tree-sitter.builtGrammars.tree-sitter-c}/parser runtime/parser/c.so + cp -f ${pkgs.vimPlugins.nvim-treesitter.builtGrammars.c}/parser runtime/parser/c.so ''; }); }; |