From 74042ae1cd5bdef282b8ef32ff99eea0ddeb4969 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 10 May 2025 14:50:40 +0900 Subject: [PATCH 1/2] gettext: 0.22.5 -> 0.25 https://savannah.gnu.org/news/?id=10699 https://savannah.gnu.org/news/?id=10730 https://savannah.gnu.org/news/?id=10765 https://savannah.gnu.org/news/?id=10769 Signed-off-by: misilelab --- pkgs/development/libraries/gettext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c2ece509aed2..247e84fb3083 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "gettext"; - version = "0.22.5"; + version = "0.25"; src = fetchurl { url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; - hash = "sha256-7BcFselpuDqfBzFE7IBhUduIEn9eQP5alMtsj6SJlqA="; + hash = "sha256-ruAtq3nZE4/cxyJrZ+yYUSG85gB+3r4w0OOdQvaaNA4="; }; patches = [ ./absolute-paths.diff From 8cdd90d2e7f7cb176bfbe466ebd3c61db2ee10b5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jun 2025 12:06:40 +0200 Subject: [PATCH 2/2] gettext: set am_cv_func_iconv_works to yes on darwin --- pkgs/development/libraries/gettext/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 247e84fb3083..e43e44c5ff35 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -95,9 +95,16 @@ stdenv.mkDerivation rec { ../../../build-support/setup-hooks/role.bash ./gettext-setup-hook.sh ]; - env = { - gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; - }; + env = + { + gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # macOS iconv implementation is slightly broken since Sonoma + # https://github.com/Homebrew/homebrew-core/pull/199639 + # https://savannah.gnu.org/bugs/index.php?66541 + am_cv_func_iconv_works = "yes"; + }; enableParallelBuilding = true; enableParallelChecking = false; # fails sometimes