neovim: remove global with lib

This commit is contained in:
Sandro Jäckel 2022-12-07 02:09:19 +01:00 committed by Matthieu Coudron
parent 79f07fb3f9
commit 5108c96e98

View file

@ -12,12 +12,10 @@
, nodejs ? null, fish ? null, python3 ? null
}:
with lib;
let
neovimLuaEnv = lua.withPackages(ps:
(with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [
++ lib.optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect
]
));
@ -61,8 +59,8 @@ in
neovimLuaEnv
tree-sitter
unibilium
] ++ optionals stdenv.isDarwin [ libiconv CoreServices ]
++ optionals doCheck [ glibcLocales procps ]
] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]
++ lib.optionals doCheck [ glibcLocales procps ]
;
inherit doCheck;
@ -86,7 +84,6 @@ in
pyEnv # for src/clint.py
];
# nvim --version output retains compilation flags and references to build tools
postPatch = ''
substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS "";
@ -101,7 +98,7 @@ in
# third-party/CMakeLists.txt is not read at all.
"-DUSE_BUNDLED=OFF"
]
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
;
preConfigure = lib.optionalString stdenv.isDarwin ''
@ -112,7 +109,7 @@ in
export VIMRUNTIME=$PWD/runtime
'';
meta = {
meta = with lib; {
description = "Vim text editor fork focused on extensibility and agility";
longDescription = ''
Neovim is a project that seeks to aggressively refactor Vim in order to: