X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/154bc46225dd80d5f073dd40d99924f95057b759..867026592b527c59c3d3a8348024052a647747cb:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 2285b99d..8ba24a3c 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,14 +1,19 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-_COMMIT=a062cd4ce58ba9aca6fdce443b014c9c0949ecde
-TERMUX_PKG_VERSION=0.2.0.201701162318
+local _COMMIT=58d2ce9bdbb6feab7176f451ca0248c78606aa2e
+TERMUX_PKG_VERSION=0.2.0.201704142034
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
+TERMUX_PKG_SHA256=5d355e23ab0fa79a1a5419ae2b24aea65e488d586c6bf724d41b94a79098ede4
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_JEMALLOC=OFF -DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit"
+TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim"
 
 termux_step_host_build () {
+	termux_setup_cmake
+
 	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
 	cmake $TERMUX_PKG_SRCDIR/third-party
@@ -20,10 +25,6 @@ termux_step_host_build () {
 	rm -Rf build/
 }
 
-termux_step_pre_configure () {
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG"
-}
-
 termux_step_post_make_install () {
 	local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim
 	mkdir -p $_CONFIG_DIR