X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..5915e2e2cc5748a38a25c2342ae613455d884393:/packages/fish/build.sh

diff --git a/packages/fish/build.sh b/packages/fish/build.sh
index 8b128dbd..9d69fee6 100644
--- a/packages/fish/build.sh
+++ b/packages/fish/build.sh
@@ -1,6 +1,20 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-TERMUX_PKG_VERSION=2.1.2
-TERMUX_PKG_SRCURL=http://fishshell.com/files/${TERMUX_PKG_VERSION}/fish-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="ncurses"
+_COMMIT=c76d86631717929b3a2f259615e8603e69e13256
+TERMUX_PKG_VERSION=2.2.201605030720
+TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/${_COMMIT}.zip
+# fish calls 'tput' from ncurses-utils, at least when cancelling (Ctrl+C) a command line:
+TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support, ncurses-utils"
 TERMUX_PKG_BUILD_IN_SRC=yes
+TERMUX_PKG_FOLDERNAME=fish-shell-$_COMMIT
+
+termux_step_pre_configure () {
+	cd $TERMUX_PKG_SRCDIR
+	autoconf
+
+	CXXFLAGS+=" $CPPFLAGS"
+
+	LDFLAGS+=" -lgnustl_shared"
+
+	export PCRE2_CONFIG_EXTRAS="--host=$TERMUX_HOST_PLATFORM"
+}