pyrox.dev
Merge #194802: libXft: 2.3.4 -> 2.3.6
...into staging
+3
-3
pkgs/servers/x11/xorg/default.nix
+3
-3
pkgs/servers/x11/xorg/default.nix
···
1082
1082
# THIS IS A GENERATED FILE. DO NOT EDIT!
1083
1083
libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
1084
1084
pname = "libXft";
1085
-
version = "2.3.4";
1085
+
version = "2.3.6";
1086
1086
builder = ./builder.sh;
1087
1087
src = fetchurl {
1088
-
url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2";
1089
-
sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp";
1088
+
url = "mirror://xorg/individual/lib/libXft-2.3.6.tar.xz";
1089
+
sha256 = "08ihq0in7iy5bwrx71nhnlkj7k1ic34brjcqs2wbnf69kwqyg9k0";
1090
1090
};
1091
1091
hardeningDisable = [ "bindnow" "relro" ];
1092
1092
strictDeps = true;
-17
pkgs/servers/x11/xorg/overrides.nix
-17
pkgs/servers/x11/xorg/overrides.nix
···
203
203
configureFlags = attrs.configureFlags or []
204
204
++ malloc0ReturnsNullCrossFlag;
205
205
206
-
patches = [
207
-
# The following three patches add color emoji rendering support.
208
-
# https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
209
-
(fetchpatch {
210
-
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch";
211
-
sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53";
212
-
})
213
-
(fetchpatch {
214
-
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch";
215
-
sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764";
216
-
})
217
-
(fetchpatch {
218
-
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch";
219
-
sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0";
220
-
})
221
-
];
222
-
223
206
# the include files need ft2build.h, and Requires.private isn't enough for us
224
207
postInstall = ''
225
208
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
+1
-1
pkgs/servers/x11/xorg/tarballs.list
+1
-1
pkgs/servers/x11/xorg/tarballs.list
···
188
188
mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2
189
189
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
190
190
mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2
191
-
mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2
191
+
mirror://xorg/individual/lib/libXft-2.3.6.tar.xz
192
192
mirror://xorg/individual/lib/libXi-1.8.tar.bz2
193
193
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
194
194
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2