freetype: 2.6.2 -> 2.6.5
The fontconfig-ultimate patches are unmaintained. Since they were not updated for newer FreeType versions, this removes them and disables fontconfig-ultimate by default.
This commit is contained in:
parent
50c0011292
commit
1c7114da69
|
@ -104,7 +104,7 @@ in
|
|||
ultimate = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable fontconfig-ultimate settings (formerly known as
|
||||
Infinality). Besides the customizable settings in this NixOS
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
|
||||
, setJavaClassPath
|
||||
, minimal ? false
|
||||
, enableInfinality ? true # font rendering patch
|
||||
, enableInfinality ? false # font rendering patch
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
@ -8,33 +8,33 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.6.2";
|
||||
|
||||
# Don't use fetchpatch. It mangles them. That's an hour I'll never get back.
|
||||
fetchbohoomil = name: sha256: fetchurl {
|
||||
url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/254b688f96d4a37f78fb594303a43160fc15c7cd/freetype/ + name;
|
||||
inherit sha256;
|
||||
};
|
||||
version = "2.6.5";
|
||||
in
|
||||
with { inherit (stdenv.lib) optional optionals optionalString; };
|
||||
stdenv.mkDerivation rec {
|
||||
name = "freetype-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/freetype/${name}.tar.bz2";
|
||||
sha256 = "14mqrfgl18q2by1yzv6vcxi97zjy4kppcgsqf312mhfwgkpvvxms";
|
||||
url = "mirror://savannah/freetype/${name}.tar.bz2";
|
||||
sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2";
|
||||
};
|
||||
|
||||
patches = []
|
||||
# mingw: these patches use `strcasestr` which isn't available on windows
|
||||
++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [
|
||||
(fetchbohoomil "01-freetype-2.6.2-enable-valid.patch"
|
||||
"1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08")
|
||||
(fetchbohoomil "02-upstream-2015.12.05.patch"
|
||||
"0781r9n35kpn8db8nma0l47cpkzh0hbp84ziii5sald90dnrqdj4")
|
||||
(fetchbohoomil "03-infinality-2.6.2-2015.12.05.patch"
|
||||
"0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8")
|
||||
];
|
||||
patches = [
|
||||
# Patch for validation of OpenType and GX/AAT tables.
|
||||
(fetchurl {
|
||||
name = "freetype-2.2.1-enable-valid.patch";
|
||||
url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990";
|
||||
sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l";
|
||||
})
|
||||
] ++ optionals (useEncumberedCode) [
|
||||
# Patch to enable subpixel rendering.
|
||||
# See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html.
|
||||
(fetchurl {
|
||||
name = "freetype-2.3.0-enable-spr.patch";
|
||||
url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990;
|
||||
sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue