pyrox.dev
gettext: 0.21.1 -> 0.22.4 (#279197)
+21
-6
pkgs/development/libraries/gettext/default.nix
+21
-6
pkgs/development/libraries/gettext/default.nix
···
8
8
9
9
stdenv.mkDerivation rec {
10
10
pname = "gettext";
11
-
version = "0.21.1";
11
+
version = "0.22.4";
12
12
13
13
src = fetchurl {
14
14
url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
15
-
sha256 = "sha256-6MNlDh2M7odcTzVWQjgsHfgwWL1aEe6FVcDPJ21kbUU=";
15
+
hash = "sha256-weC7KkQnqQJDkMZizVMtZkxLNrj/RE7V5UsRX9t6Guo=";
16
16
};
17
17
patches = [
18
18
./absolute-paths.diff
···
47
47
];
48
48
49
49
postPatch = ''
50
-
substituteAllInPlace gettext-runtime/src/gettext.sh.in
51
-
substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
52
-
substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
53
-
substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
50
+
# Older versions of gettext come with a copy of `extern-inline.m4` that is not compatible with clang 18.
51
+
# When a project uses gettext + autoreconfPhase, autoreconfPhase will invoke `autopoint -f`, which will
52
+
# replace whatever (probably compatible) version of `extern-inline.m4` with one that probalby won’t work
53
+
# because `autopoint` will copy the autoconf macros from the project’s required version of gettext.
54
+
# Fixing this requires replacing all the older copies of the problematic file with a new one.
55
+
#
56
+
# This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase.
57
+
declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
58
+
oldFilesDir=$(mktemp -d)
59
+
for oldFile in "''${oldFiles[@]}"; do
60
+
mkdir -p "$oldFilesDir/$(dirname "$oldFile")"
61
+
cp gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile"
62
+
done
63
+
tar uf gettext-tools/misc/archive.dir.tar -C "$oldFilesDir" "''${oldFiles[@]}"
64
+
65
+
substituteAllInPlace gettext-runtime/src/gettext.sh.in
66
+
substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
67
+
substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
68
+
substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd
54
69
'' + lib.optionalString stdenv.hostPlatform.isCygwin ''
55
70
sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
56
71
sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
+4
-1
pkgs/stdenv/linux/default.nix
+4
-1
pkgs/stdenv/linux/default.nix
···
385
385
configureFlags = (a.configureFlags or []) ++ [
386
386
"--with-native-system-header-dir=/include"
387
387
"--with-build-sysroot=${lib.getDev self.stdenv.cc.libc}"
388
+
# Don't assume that `gettext` was built with iconv support, since we don't have
389
+
# our own `glibc` yet.
390
+
"--disable-nls"
388
391
];
389
392
390
393
# This is a separate phase because gcc assembles its phase scripts
···
507
510
overrides = self: super: rec {
508
511
inherit (prevStage)
509
512
ccWrapperStdenv
510
-
binutils coreutils gnugrep gettext
513
+
binutils coreutils gnugrep
511
514
perl patchelf linuxHeaders gnum4 bison libidn2 libunistring libxcrypt;
512
515
# We build a special copy of libgmp which doesn't use libstdc++, because
513
516
# xgcc++'s libstdc++ references the bootstrap-files (which is what
+5
pkgs/tools/misc/fontforge/default.nix
+5
pkgs/tools/misc/fontforge/default.nix
···
29
29
url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch";
30
30
hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU=";
31
31
})
32
+
# Fixes translation compatibility with gettext 0.22
33
+
(fetchpatch {
34
+
url = "https://github.com/fontforge/fontforge/commit/55d58f87ab1440f628f2071a6f6cc7ef9626c641.patch";
35
+
hash = "sha256-rkYnKPXA8Ztvh9g0zjG2yTUCPd3lE1uqwvBuEd8+Oyw=";
36
+
})
32
37
33
38
# https://github.com/fontforge/fontforge/pull/5423
34
39
./replace-distutils.patch