summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/neovim
diff options
context:
space:
mode:
authorCraig Hall <ch9871@gmail.com>2019-08-01 12:52:11 +0100
committerRoman Volosatovs <rvolosatovs@riseup.net>2019-09-16 16:10:13 +0200
commit6bdaca51e80b2759f2d3c9ed298b0963eac16461 (patch)
treeb9b8edee51529ac712ba3b02119ec07628fda8a1 /pkgs/applications/editors/neovim
parent48af02a402e6f000a3cf1f1b46087e2d74638dc2 (diff)
neovim: sort lists alphabetically
Diffstat (limited to 'pkgs/applications/editors/neovim')
-rw-r--r--pkgs/applications/editors/neovim/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 7d558dfb8937..8c39eed8a4ad 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
let
neovimLuaEnv = lua.withPackages(ps:
- (with ps; [ mpack lpeg luabitop ]
+ (with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect
]
@@ -41,14 +41,14 @@ in
enableParallelBuilding = true;
buildInputs = [
+ gperf
libtermkey
libuv
+ libvterm-neovim
msgpack
ncurses
- libvterm-neovim
- unibilium
- gperf
neovimLuaEnv
+ unibilium
] ++ optional withJemalloc jemalloc
++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ]
@@ -77,8 +77,8 @@ in
disallowedReferences = [ stdenv.cc ];
cmakeFlags = [
- "-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DGPERF_PRG=${gperf}/bin/gperf"
+ "-DLUA_PRG=${neovimLuaEnv.interpreter}"
]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"