diff options
author | Doron Behar <doron.behar@gmail.com> | 2022-03-29 05:48:19 +0300 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2022-03-29 22:16:24 +0300 |
commit | f80b906b3a4236320f92245a596204a3bfbe8543 (patch) | |
tree | a2df061b755416428cd1dc207f7103772e7c26c1 /pkgs/applications/editors/neovim | |
parent | d3dcc106c82e43268e5e8f6db652e910c46d07ca (diff) | |
download | nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar.gz nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar.bz2 nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar.lz nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar.xz nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.tar.zst nixlib-f80b906b3a4236320f92245a596204a3bfbe8543.zip |
neovim: cleanup a bit libluv related hacks
Remove unneeded cmakeFlags and explain more what is the difference between lua.pkgs.libluv and lua.pkgs.luv.
Diffstat (limited to 'pkgs/applications/editors/neovim')
-rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 86d70acfff3c..ef0b075c4d16 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -21,14 +21,6 @@ let )); pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); - - # FIXME: this is verry messy and strange. - # see https://github.com/NixOS/nixpkgs/pull/80528 - luv = lua.pkgs.luv; - luvpath = with builtins ; if stdenv.isDarwin - then "${luv.libluv}/lib/lua/${lua.luaversion}/libluv.${head (match "([0-9.]+).*" luv.version)}.dylib" - else "${luv}/lib/lua/${lua.luaversion}/luv.so"; - in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; @@ -57,7 +49,11 @@ in libtermkey libuv libvterm-neovim - luv.libluv + # This is actually a c library, hence it's not included in neovimLuaEnv, + # see: + # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570 + # and it's definition at: pkgs/development/lua-modules/overrides.nix + lua.pkgs.libluv msgpack ncurses neovimLuaEnv @@ -97,12 +93,12 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DGPERF_PRG=${gperf}/bin/gperf" - "-DLUA_PRG=${neovimLuaEnv.interpreter}" - "-DLIBLUV_LIBRARY=${luvpath}" + # Don't use downloaded dependencies. At the end of the configurePhase one + # can spot that cmake says this option was "not used by the project". + # That's because all dependencies were found and + # third-party/CMakeLists.txt is not read at all. "-DUSE_BUNDLED=OFF" ] - ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; |