diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 0518cb257ab..37f88a770fc 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,5 +1,14 @@
-{ stdenv, substituteAll, fetchurl
-, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts
+{ stdenv
+, fetchpatch
+, substituteAll
+, fetchurl
+, pkg-config
+, freetype
+, expat
+, libxslt
+, gperf
+, dejavu_fonts
+, autoreconfHook
}:
/** Font configuration scheme
@@ -18,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "fontconfig";
- version = "2.12.6";
+ version = "2.13.92";
src = fetchurl {
- url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2";
- sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g";
+ url = "http://fontconfig.org/release/${pname}-${version}.tar.xz";
+ sha256 = "0kkfsvxcvcphm9zcgsh646gix3qn4spz555wa1jp5hbq70l62vjh";
};
patches = [
@@ -31,15 +40,44 @@ stdenv.mkDerivation rec {
inherit configVersion;
})
+ # Fix fonts not being loaded when missing included configs that have ignore_missing="yes".
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1744377
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/fcada522913e5e07efa6367eff87ace9f06d24c8.patch";
+ sha256 = "1jbm3vw45b3qjnqrh2545v1k8vmb29c09v2wj07jnrq3lnchbvmn";
+ })
+
+ # Register JoyPixels as an emoji font.
# https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
- ./fix-joypixels.patch
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/65087ac7ce4cc5f2109967c1380b474955dcb590.patch";
+ sha256 = "1dkrbqx1c1d8yfnx0igvv516wanw2ksrpm3fbpm2h9nw0hccwqvm";
+ })
+
+ # Fix invalid DTD in reset-dirs.
+ # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/78
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/a4aa66a858f1ecd375c5efe5916398281f73f794.patch";
+ sha256 = "1j4ky8jhpllfm1lh2if34xglh2hl79nsa0xxgzxpj9sx6h4v99j5";
+ })
];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
- propagatedBuildInputs = [ freetype ];
- nativeBuildInputs = [ pkgconfig gperf libxslt ];
- buildInputs = [ expat ];
+ nativeBuildInputs = [
+ gperf
+ libxslt
+ pkg-config
+ autoreconfHook
+ ];
+
+ buildInputs = [
+ expat
+ ];
+
+ propagatedBuildInputs = [
+ freetype
+ ];
configureFlags = [
"--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
diff --git a/pkgs/development/libraries/fontconfig/fix-joypixels.patch b/pkgs/development/libraries/fontconfig/fix-joypixels.patch
deleted file mode 100644
index d5654063fe8..00000000000
--- a/pkgs/development/libraries/fontconfig/fix-joypixels.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/conf.d/45-generic.conf
-+++ b/conf.d/45-generic.conf
-@@ -5,6 +5,10 @@
-
-
-
-+
-+ JoyPixels
-+ emoji
-+
-
- Emoji Two
- emoji
---- a/conf.d/60-generic.conf
-+++ b/conf.d/60-generic.conf
-@@ -29,6 +29,7 @@
-
- emoji
-
-+ JoyPixels
- Emoji Two
- Emoji One
-