From 810c6c387ba97d726cb61999a9f474b7f62a1e7f Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 25 Jul 2022 21:35:38 -0700 Subject: [PATCH] gettext: apply gnulib.passthru.longdouble-redirect-patch --- pkgs/development/libraries/gettext/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 81f7abc90a3..5443f1eeac0 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash }: +{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash +, gnulib +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -45,6 +47,14 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in + '' + + # This change to gettext's vendored copy of gnulib is already + # merged upstream; we can drop this patch on the next version + # bump. It must be applied twice because gettext vendors gnulib + # not once, but twice! + '' + patch -p2 -d gettext-tools/gnulib-lib/ < ${gnulib.passthru.longdouble-redirect-patch} + patch -p2 -d gettext-tools/libgrep/ < ${gnulib.passthru.longdouble-redirect-patch} ''; strictDeps = true;