From d356d5ea38deebe895c2f20536e38b0f63e813e8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 7 Aug 2023 10:33:00 -0700
Subject: [PATCH] build: add libxml2/libbuid for fontconfig dynamic link for CI

---
 build.zig        | 9 ++++++++-
 nix/devshell.nix | 9 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.zig b/build.zig
index 3733a5534..07056c0a1 100644
--- a/build.zig
+++ b/build.zig
@@ -718,7 +718,14 @@ fn addDeps(
         step.linkSystemLibrary("pixman-1");
         step.linkSystemLibrary("zlib");
 
-        if (font_backend.hasFontconfig()) step.linkSystemLibrary("fontconfig");
+        if (font_backend.hasFontconfig()) {
+            step.linkSystemLibrary("fontconfig");
+
+            // Required on some systems, and pkg-config for fontconfig
+            // doesn't include it
+            step.linkSystemLibrary("libxml-2.0");
+            step.linkSystemLibrary("uuid");
+        }
     }
 
     // Other dependencies, we may dynamically link
diff --git a/nix/devshell.nix b/nix/devshell.nix
index b44a54f1d..815e4490b 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -30,7 +30,8 @@
 , harfbuzz
 , libpng
 , libGL
-, libuv
+, libuuid
+, libxml2
 , libX11
 , libXcursor
 , libXext
@@ -51,7 +52,8 @@ let
     freetype
     harfbuzz
     libpng
-    libuv
+    libuuid
+    libxml2
     zlib
 
     libX11
@@ -105,7 +107,8 @@ in mkShell rec {
     freetype
     harfbuzz
     libpng
-    libuv
+    libuuid
+    libxml2
     pixman
     zlib