diff options
| author | Sirio Balmelli <sirio@b-ad.ch> | 2020-08-13 20:50:06 +0200 |
|---|---|---|
| committer | Sirio Balmelli <sirio@b-ad.ch> | 2020-08-14 23:29:31 +0200 |
| commit | 0f1434cb2adb8bec6678b53510750ce7c1814263 (patch) | |
| tree | 9a9f4669d549e69706535d0ce316fdaae7d76f2d /pkgs/applications/editors/neovim | |
| parent | 00c48082521d6fbf236abf5c80cd3d2abac9d0df (diff) | |
neovim: fix build on Darwin
libluv path passed to -DLIBLUV_LIBRARY broken by change in libluv, eg:
libluv.dylib -> libluv.1.30.0.dylib
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e56e7d938073..b546aae790a7 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -20,6 +20,14 @@ let )); pyEnv = python.withPackages(ps: [ ps.pynvim ps.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"; @@ -47,7 +55,7 @@ in libtermkey libuv libvterm-neovim - lua.pkgs.luv.libluv + luv.libluv msgpack ncurses neovimLuaEnv @@ -88,10 +96,8 @@ in cmakeFlags = [ "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" + "-DLIBLUV_LIBRARY=${luvpath}" ] - # FIXME: this is verry messy and strange. - ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" - ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib" ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; |