wget2: fix build with gettext 0.25.0

2025-07-28 21:07:05 +02:00 · 2025-07-28 21:07:05 +02:00 · 30bf1e245d
commit 30bf1e245d
parent 391e07ae46
2 changed files with 29 additions and 0 deletions
--- a/pkgs/by-name/wg/wget2/gettext-0.25.patch
+++ b/pkgs/by-name/wg/wget2/gettext-0.25.patch
@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 7429f614..67b0bf0c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -410,17 +410,11 @@ test "${ENABLE_XATTR}" = "yes" && AC_DEFINE([ENABLE_XATTR], 1,
+ #
+ # Gettext
+ #
+-m4_ifdef([AM_GNU_GETTEXT], [
+-  AM_GNU_GETTEXT([external],[need-ngettext])
+-  AC_CONFIG_FILES([po/Makefile.in])
+-  have_po=yes
+-], [
+-  have_po=no
+-])
+-m4_ifdef([AM_GNU_GETTEXT_VERSION], [
+AM_GNU_GETTEXT([external],[need-ngettext])
+AC_CONFIG_FILES([po/Makefile.in])
+have_po=yes
+ #do not indent here
+ AM_GNU_GETTEXT_VERSION([0.21])
+-])
+ AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = "yes" ])
+ 
+ #
--- a/pkgs/by-name/wg/wget2/package.nix
+++ b/pkgs/by-name/wg/wget2/package.nix
@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
    hash = "sha256-0tOoStZHr5opehFmuQdFRPYvOv8IMrDTBNFtoweY3VM=";
  };

+  patches = [
+    ./gettext-0.25.patch
+  ];
+
  # wget2_noinstall contains forbidden reference to /build/
  postPatch = ''
    substituteInPlace src/Makefile.am \