mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
Merge pull request #28937 from teto/neovim
neovim: fix missing dependancy luajit lpeg
This commit is contained in:
commit
526b4ebc45
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
|
{ 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
|
, unibilium, makeWrapper, vimUtils, xsel, gperf
|
||||||
|
|
||||||
, withPython ? true, pythonPackages, extraPythonPackages ? []
|
, withPython ? true, pythonPackages, extraPythonPackages ? []
|
||||||
@ -115,7 +115,7 @@ let
|
|||||||
LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs);
|
LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs);
|
||||||
LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath 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 = [
|
cmakeFlags = [
|
||||||
"-DLUA_PRG=${luaPackages.lua}/bin/lua"
|
"-DLUA_PRG=${luaPackages.lua}/bin/lua"
|
||||||
|
Loading…
Reference in New Issue
Block a user