Fix setting of FONTCONFIG_FILE (#1)

Fix setting of FONTCONFIG_FILE

Author: staticfloat

Project.toml

@@ -6,6 +6,7 @@ version = "0.7.0"
 BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 Cairo_jll = "83423d85-b0ee-5818-9007-b63ccbeb887a"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
+Fontconfig_jll = "a3f928ae-7b40-5064-980b-68af3947d34b"
 Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
 Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

src/Cairo.jl

@@ -8,6 +8,8 @@ using Cairo_jll
 using Pango_jll
 # For libgobject
 using Glib_jll
+# We only need the path of libfontconfig
+using Fontconfig_jll
 
 # Deprecate old library variables
 Base.@deprecate_binding _jl_libcairo      Cairo.libcairo   false
@@ -16,12 +18,9 @@ Base.@deprecate_binding _jl_libpango      Cairo.libpango   false
 Base.@deprecate_binding _jl_libpangocairo Cairo.libpango   false
 
 function __init__()
-    # On Linux and FreeBSD we use FontConfig. Set FONTCONFIG_PATH only if none
-    # of FONTCONFIG_PATH or FONTCONFIG_FILE is set.
-    if !(Sys.isapple() || Sys.iswindows()) && get(ENV, "FONTCONFIG_PATH", "") == "" &&
-        get(ENV, "FONTCONFIG_FILE", "") == ""
-        ENV["FONTCONFIG_PATH"] = joinpath(dirname(libcairo), "..", "etc", "fonts")
-    end
+    # Set FONTCONFIG_FILE to the config file we provide.
+    ENV["FONTCONFIG_FILE"] = joinpath(dirname(Fontconfig_jll.libfontconfig_path),
+                                      "..", "etc", "fonts", "fonts.conf")
 end
 
 using Colors