alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge #194802: libXft: 2.3.4 -> 2.3.6

Browse source 
...into staging
This commit is contained in:
Vladimír Čunát 2022-10-13 19:15:07 +02:00
parent ef6a273c70 167fc5aa3e
commit 8d7a17eaf0
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/x11/xorg/default.nix
View file

@ -1082,11 +1082,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
pname = "libXft";
version = "2.3.4";
version = "2.3.6";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2";
sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp";
url = "mirror://xorg/individual/lib/libXft-2.3.6.tar.xz";
sha256 = "08ihq0in7iy5bwrx71nhnlkj7k1ic34brjcqs2wbnf69kwqyg9k0";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;

17
pkgs/servers/x11/xorg/overrides.nix
View file

@ -203,23 +203,6 @@ self: super:
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
patches = [
# The following three patches add color emoji rendering support.
# https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch";
sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch";
sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch";
sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0";
})
];
# the include files need ft2build.h, and Requires.private isn't enough for us
postInstall = ''
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"

2
pkgs/servers/x11/xorg/tarballs.list
View file

@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2
mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.6.tar.xz
mirror://xorg/individual/lib/libXi-1.8.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2