From b9b33ab25d8899cd7d49a1dee6c0b4e3a8ac2987 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 23 Oct 2023 08:40:25 -0700
Subject: [PATCH] pkg/fontconfig: make iconv build param non-windows specific

---
 build.zig                | 1 -
 pkg/fontconfig/build.zig | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.zig b/build.zig
index 9ceb27ba3..a455b672d 100644
--- a/build.zig
+++ b/build.zig
@@ -625,7 +625,6 @@ fn addDeps(
     const fontconfig_dep = b.dependency("fontconfig", .{
         .target = step.target,
         .optimize = step.optimize,
-        .@"enable-iconv-win" = false,
     });
     const freetype_dep = b.dependency("freetype", .{
         .target = step.target,
diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig
index 2f9a578cc..0a927d66f 100644
--- a/pkg/fontconfig/build.zig
+++ b/pkg/fontconfig/build.zig
@@ -6,7 +6,11 @@ pub fn build(b: *std.Build) !void {
     const optimize = b.standardOptimizeOption(.{});
 
     const libxml2_enabled = b.option(bool, "enable-libxml2", "Build libxml2") orelse true;
-    const iconv_win_enabled = b.option(bool, "enable-iconv-win", "Build libxml2 with iconv on Windows") orelse false;
+    const libxml2_iconv_enabled = b.option(
+        bool,
+        "enable-libxml2-iconv",
+        "Build libxml2 with iconv",
+    ) orelse (target.getOsTag() != .windows);
     const freetype_enabled = b.option(bool, "enable-freetype", "Build freetype") orelse true;
 
     _ = b.addModule("fontconfig", .{ .source_file = .{ .path = "main.zig" } });
@@ -29,7 +33,7 @@ pub fn build(b: *std.Build) !void {
         const libxml2_dep = b.dependency("libxml2", .{
             .target = target,
             .optimize = optimize,
-            .iconv = target.getOsTag() != .windows or iconv_win_enabled,
+            .iconv = libxml2_iconv_enabled,
         });
         lib.linkLibrary(libxml2_dep.artifact("xml2"));
     }