libXft: 2.3.4 -> 2.3.6
This commit is contained in:
parent
0b4912d905
commit
167fc5aa3e
@ -1082,11 +1082,11 @@ lib.makeScope newScope (self: with self; {
|
|||||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||||
libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
|
libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
|
||||||
pname = "libXft";
|
pname = "libXft";
|
||||||
version = "2.3.4";
|
version = "2.3.6";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2";
|
url = "mirror://xorg/individual/lib/libXft-2.3.6.tar.xz";
|
||||||
sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp";
|
sha256 = "08ihq0in7iy5bwrx71nhnlkj7k1ic34brjcqs2wbnf69kwqyg9k0";
|
||||||
};
|
};
|
||||||
hardeningDisable = [ "bindnow" "relro" ];
|
hardeningDisable = [ "bindnow" "relro" ];
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
@ -203,23 +203,6 @@ self: super:
|
|||||||
configureFlags = attrs.configureFlags or []
|
configureFlags = attrs.configureFlags or []
|
||||||
++ malloc0ReturnsNullCrossFlag;
|
++ 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
|
# the include files need ft2build.h, and Requires.private isn't enough for us
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
|
sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
|
||||||
|
@ -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/libXfixes-6.0.0.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXfont-1.5.4.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/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/libXi-1.8.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
|
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
|
||||||
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
|
mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
|
||||||
|
Loading…
Reference in New Issue
Block a user