X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5c27759db4e34e6d1b20811db1f6e9dd1255a3ca..04c9591ade3c6c77d8d12019ac0e02f4c9c43ebd:/packages/neovim/build.sh

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 6c9c22aa..55029a7b 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,13 +1,18 @@
 TERMUX_PKG_HOMEPAGE=http://neovim.org/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-TERMUX_PKG_VERSION=0.0.`date "+%Y%m%d%H%M"`
-TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/master.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
-TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libluajit, libvterm, libtermkey"
-TERMUX_PKG_FOLDERNAME="neovim-master"
+_COMMIT=0d93cd6c46e0b81e981197c4446aceb325325b5a
+TERMUX_PKG_VERSION=0.1.5.201608040622
+TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
+TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
+TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
 
 termux_step_host_build () {
+	mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps
+	cd $TERMUX_PKG_HOSTBUILD_DIR/deps
+	cmake $TERMUX_PKG_SRCDIR/third-party
+	make
+
 	cd $TERMUX_PKG_SRCDIR
 	make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH=$TERMUX_PKG_HOSTBUILD_DIR" install
 	make distclean
@@ -15,8 +20,8 @@ termux_step_host_build () {
 }
 
 termux_step_configure () {
-	# Install dependencies on ubuntu:
-	# apt install lua-lpeg luarocks; luarocks install lpeg; luarocks install lua-MessagePack; luarocks install luabitop
+	touch $TERMUX_PKG_HOSTBUILD_DIR/deps/CMakeCache.txt
+
 	cd $TERMUX_PKG_BUILDDIR
 	cmake -G "Unix Makefiles" .. \
 		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
@@ -32,11 +37,17 @@ termux_step_configure () {
                 -DCMAKE_MAKE_PROGRAM=`which make` \
 		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
 		-DCMAKE_SYSTEM_NAME=Linux \
-                -DLUA_PRG=`which lua` \
                 -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
+                -DENABLE_JEMALLOC=OFF \
+		-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit \
 		$TERMUX_PKG_SRCDIR
 }
 
 termux_step_post_make_install () {
-	cp $TERMUX_PKG_BUILDER_DIR/nvimrc $TERMUX_PREFIX/share/nvim/nvimrc
+	local _CONFIG_DIR=$TERMUX_PREFIX/etc/xdg/nvim
+	mkdir -p $_CONFIG_DIR
+	cp $TERMUX_PKG_BUILDER_DIR/init.vim $_CONFIG_DIR/
+
+	# neovim needs col for the man command:
+	$CC $CFLAGS $LDFLAGS -isystem $TERMUX_PREFIX/include/libandroid-support $TERMUX_PKG_BUILDER_DIR/col.c -o $TERMUX_PREFIX/bin/col
 }