diff --git a/pkgs/by-name/ht/html2text/gettext-0.25.patch b/pkgs/by-name/ht/html2text/gettext-0.25.patch new file mode 100644 index 0000000000000..ebc2aa9a01886 --- /dev/null +++ b/pkgs/by-name/ht/html2text/gettext-0.25.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile.am b/Makefile.am +index af28077..e746147 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,6 +13,8 @@ + AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I m4 + ++SUBDIRS = ++ + AM_YFLAGS = -d -Wno-yacc + + bin_PROGRAMS = html2text +diff --git a/configure.ac b/configure.ac +index 999c6fe..30c2536 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,8 +15,11 @@ + + AC_PREREQ([2.71]) + AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS]) ++AC_CONFIG_MACRO_DIRS([m4]) + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE([disable]) ++AM_GNU_GETTEXT_VERSION([0.20]) ++AM_GNU_GETTEXT([external]) + AM_ICONV + #AC_CONFIG_SRCDIR([html.h]) + #AC_CONFIG_HEADERS([config.h]) diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix index 7e6e46d6033f0..80969c8e34a48 100644 --- a/pkgs/by-name/ht/html2text/package.nix +++ b/pkgs/by-name/ht/html2text/package.nix @@ -2,22 +2,35 @@ lib, stdenv, fetchFromGitLab, + autoconf-archive, autoreconfHook, + bison, + gettext, libiconv, }: stdenv.mkDerivation rec { pname = "html2text"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitLab { owner = "grobian"; repo = "html2text"; rev = "v${version}"; - hash = "sha256-7Ch51nJ5BeRqs4PEIPnjCGk+Nm2ydgJQCtkcpihXun8="; + hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + bison + gettext + ]; + + # These changes have all been made in HEAD, across several commits + # amongst other changes. + # See https://gitlab.com/grobian/html2text/-/merge_requests/57 + patches = [ ./gettext-0.25.patch ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;