X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e260a17a3754b535e9a89481687f09ad5a37aa8e..73d77d8ac7562cd897c84c6cbcadc6346cd6dc27:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 182e2ddb..79bcfcce 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-local _COMMIT=34c3f03013375817d3d089e685793290eded553a
-TERMUX_PKG_VERSION=0.2.1~20170504
+local _COMMIT=4618c9c43b2fe052332329b347ac10b4b1db94b5
+TERMUX_PKG_VERSION=0.2.3~2017.11.29
+TERMUX_PKG_SHA256=8d921d73feb1388700f906b2ab2c06a4e44223af60ddc767a6af8b9ca4c78dd5
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
-TERMUX_PKG_SHA256=ea281cf88fba41de3ebf41ecb8974ef1c589a210710c02731d8a841327b672c6
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
-TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua, libunibilium"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DENABLE_JEMALLOC=OFF
@@ -15,6 +14,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit
 -DPKG_CONFIG_EXECUTABLE=`which pkg-config`
 -DXGETTEXT_PRG=`which xgettext`
+-DPREFER_LUA=ON
+-DLUA_INCLUDE_DIR=$TERMUX_PREFIX/include
 "
 TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
@@ -24,10 +25,10 @@ termux_step_host_build () {
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cmake $TERMUX_PKG_SRCDIR/third-party
-	make
+	make -j 1
 
 	cd $TERMUX_PKG_SRCDIR
-	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
+	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=$TERMUX_PKG_HOSTBUILD_DIR -DUSE_BUNDLED_LUAROCKS=ON" install
 	make distclean
 	rm -Rf build/
 }