From 0b68e04b5f87be7d6f8a755935e381f17133c730 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sat, 21 Feb 2026 13:58:27 +0700
Subject: [PATCH] perhaps this bypasses the conflict with openssl

---
 Cargo.toml                   | 6 ++++--
 build/service_cpu.Dockerfile | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bf3609b35c..dffff62fa3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -299,7 +299,9 @@ toml = "0.8.23"
 url = { version = "2.5.4", features = ["serde"] }
 uuid = "1.18.1"
 
-# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
+# NB(1): wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
+#
+# NB(2): wreq's boring conflicts with openssl. Use the `prefix-symbols` feature.
 #
 # Mac:
 #   brew install --formula cmake pkg-config llvm
@@ -309,5 +311,5 @@ uuid = "1.18.1"
 #   choco install pkgconfiglite -y
 #   choco install llvm -y
 #   choco install nasm -y
-wreq = { version = "6.0.0-rc.20", features = ["json", "multipart", "cookies", "ws", "stream"] }
+wreq = { version = "6.0.0-rc.20", features = ["json", "multipart", "cookies", "ws", "stream", "prefix-symbols"] }
 wreq-util = "3.0.0-rc.6"
diff --git a/build/service_cpu.Dockerfile b/build/service_cpu.Dockerfile
index 3475475af8..8c66e761c0 100644
--- a/build/service_cpu.Dockerfile
+++ b/build/service_cpu.Dockerfile
@@ -48,8 +48,12 @@ RUN apt-get update \
         curl \
         ffmpeg \
         fontconfig \
+        git \
+        libclang-dev \
         libfontconfig1-dev \
         libssl-dev \
+        musl-tools \
+        perl \
         pkg-config
 
 # NB: Fix for fontconfig (servo-fontconfig-sys): https://github.com/alacritty/alacritty/issues/4423#issuecomment-727277235