diff --git a/packages/nim/build.sh b/packages/nim/build.sh index 869ea1570..e80c8b708 100644 --- a/packages/nim/build.sh +++ b/packages/nim/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Nim programming language compiler" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="copying.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.4.8 +TERMUX_PKG_VERSION=1.6.0 TERMUX_PKG_SRCURL=https://nim-lang.org/download/nim-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=b798c577411d7d95b8631261dbb3676e9d1afd9e36740d044966a0555b41441a +TERMUX_PKG_SHA256=52065d48d72a72702ec1afe5f7a9831e11673531e279cdff9caec01a07eec63d TERMUX_PKG_DEPENDS="clang, git, libandroid-glob" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/nim/makefile.patch b/packages/nim/makefile.patch new file mode 100644 index 000000000..5ad6e8592 --- /dev/null +++ b/packages/nim/makefile.patch @@ -0,0 +1,12 @@ +diff -uNr nim-1.6.0/makefile nim-1.6.0.mod/makefile +--- nim-1.6.0/makefile 2021-10-19 01:39:26.000000000 +0100 ++++ nim-1.6.0.mod/makefile 2021-11-28 08:52:56.003610701 +0100 +@@ -23,7 +23,7 @@ + + ifeq ($(uos),linux) + myos = linux +- LDFLAGS += -ldl -lm -lrt ++ LDFLAGS += -ldl -lm + endif + ifeq ($(uos),dragonfly) + myos = freebsd diff --git a/packages/nim/osproc.nim.patch b/packages/nim/osproc.nim.patch index 0e0d5b30a..181004aa7 100644 --- a/packages/nim/osproc.nim.patch +++ b/packages/nim/osproc.nim.patch @@ -1,12 +1,12 @@ -diff -uNr nim-1.4.0/lib/pure/osproc.nim nim-1.4.0.mod/lib/pure/osproc.nim ---- nim-1.4.0/lib/pure/osproc.nim 2020-10-30 15:31:18.741930200 +0100 -+++ nim-1.4.0.mod/lib/pure/osproc.nim 2020-10-30 15:29:53.596433900 +0100 -@@ -955,7 +955,7 @@ +diff -uNr nim-1.6.0/lib/pure/osproc.nim nim-1.6.0.mod/lib/pure/osproc.nim +--- nim-1.6.0/lib/pure/osproc.nim 2021-10-19 01:39:28.000000000 +0100 ++++ nim-1.6.0.mod/lib/pure/osproc.nim 2021-11-28 07:17:57.000000000 +0100 +@@ -982,7 +982,7 @@ if poEvalCommand in options: const useShPath {.strdefine.} = when not defined(android): "/bin/sh" - else: "/system/bin/sh" + else: "@TERMUX_PREFIX@/bin/sh" data.sysCommand = useShPath - sysArgsRaw = @[data.sysCommand, "-c", command] + sysArgsRaw = @[useShPath, "-c", command] assert args.len == 0, "`args` has to be empty when using poEvalCommand."