diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-10-04 13:05:32 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-04 13:05:32 +0900 |
| commit | 81487f73eb5ecc1bb4d3ce5a3a2d97799c8ae127 (patch) | |
| tree | ed60e82c670eae406cba8eea4e1f5cd31e5dc518 /pkgs/applications/editors/neovim | |
| parent | 0137b08bd1070a22564bf67bb7a678d2a6a60452 (diff) | |
| parent | c819648a68edd4bfe44456f04830cffdfeb49b11 (diff) | |
Merge pull request #70215 from LnL7/darwin-lua-libluv
neovim: fix darwin build
Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 6808d7115c57..99b04059730d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -79,9 +79,11 @@ in cmakeFlags = [ "-DGPERF_PRG=${gperf}/bin/gperf" - "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" "-DLUA_PRG=${neovimLuaEnv.interpreter}" ] + # 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" ; |