diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2017-09-03 15:29:13 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2017-09-03 15:29:13 +0200 |
| commit | 9889c1c661831b837516ac5f2636f84cf7e77df5 (patch) | |
| tree | 47795fb816319823146447e541de5c3f680032e8 | |
| parent | 35f89413e288f91837c625d38ac63eca9c2714b8 (diff) | |
| download | nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar.gz nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar.bz2 nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar.lz nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar.xz nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.tar.zst nixlib-9889c1c661831b837516ac5f2636f84cf7e77df5.zip | |
neovim: fix missing dependancy luajit lpeg
luajit libraries are not the same as vanilla lua ones, hence when luajit is enabled, the build fails. Fixes https://github.com/NixOS/nixpkgs/issues/14442
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index ca915b3e6d1b..dafd4e6f1204 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey -, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig +, libtool, libuv, luajit, luajitPackages, luaPackages, ncurses, perl, pkgconfig , unibilium, makeWrapper, vimUtils, xsel, gperf , withPython ? true, pythonPackages, extraPythonPackages ? [] @@ -115,7 +115,7 @@ let LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs); LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs); - lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; + lualibs = [ luaPackages.mpack luaPackages.lpeg luajitPackages.lpeg luaPackages.luabitop ]; cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" |