diff options
Diffstat (limited to 'pkgs/development/libraries/fontconfig/config-compat.patch')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/config-compat.patch | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/development/libraries/fontconfig/config-compat.patch b/pkgs/development/libraries/fontconfig/config-compat.patch index ddf7bc78180ca..e86f08fb553c9 100644 --- a/pkgs/development/libraries/fontconfig/config-compat.patch +++ b/pkgs/development/libraries/fontconfig/config-compat.patch @@ -1,22 +1,17 @@ -From 2ff9b53ce755be183ef9274f7dd3f9ac537173f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> -Date: Tue, 4 Nov 2014 12:24:25 +0100 -Subject: [PATCH] add check for /etc/fonts/@configVersion@/fonts.conf +commit 05c6adf8104b4321d3a3716a7b9feb6bf223ed0c (HEAD, nixpkgs) +Author: Vladimír Čunát <vcunat@gmail.com> +Date: Tue Nov 4 12:24:25 2014 +0100 -It's checked between FONTCONFIG_FILE and the in-package etc/fonts/fonts.conf. -The latter is used so that on non-NixOS distributions, fontconfig works at least -with upstream defaults, even when the global config is incompatible. - -Co-Authored-By: Jan Tojnar <jtojnar@gmail.com> ---- - src/fccfg.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + add check for /etc/fonts/@configVersion@/fonts.conf + + It's checked between FONTCONFIG_FILE and the usual /etc/fonts/fonts.conf. + Also, hardcode /etc/fonts/fonts.conf to prevent accidental override. diff --git a/src/fccfg.c b/src/fccfg.c -index 342c996..98a1324 100644 +index 6377fd7..e9eb10a 100644 --- a/src/fccfg.c +++ b/src/fccfg.c -@@ -2391,8 +2391,13 @@ FcConfigGetFilename (FcConfig *config, +@@ -2070,8 +2070,13 @@ FcConfigFilename (const FcChar8 *url) if (!url || !*url) { url = (FcChar8 *) getenv ("FONTCONFIG_FILE"); @@ -27,10 +22,7 @@ index 342c996..98a1324 100644 + } if (!url) - url = (FcChar8 *) FONTCONFIG_FILE; -+ url = (FcChar8 *) FONTCONFIG_PATH "/" FONTCONFIG_FILE; ++ url = (FcChar8 *) "/etc/fonts/fonts.conf"; } file = 0; --- -2.26.2 - |