neovim: fix build with libluv

gloaming · Jul 27, 2019 · 9302546 · 9302546
1 parent 14502ca
commit 9302546
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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 luv compat53 ]
+    (with ps; [ compat53 lpeg luabitop luv luv-dev mpack ]
     ++ optionals doCheck [
         nvim-client coxpcall busted luafilesystem penlight inspect
       ]
@@ -79,7 +79,8 @@ in
     cmakeFlags = [
       "-DGPERF_PRG=${gperf}/bin/gperf"
       "-DLUA_PRG=${neovimLuaEnv.interpreter}"
-      "-DUSE_BUNDLED_LUV=ON"
+      "-DLIBLUV_LIBRARY=${lua.pkgs.luv-dev}/lib/lua/${lua.luaversion}/libluv.a"
+      "-DLIBLUV_INCLUDE_DIR=${lua.pkgs.luv-dev}/include"
     ]
     ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
     ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"