From d4b53cac06260ac48653467c1d94d1cfd8055ced Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sat, 13 Jan 2024 15:11:28 -0800
Subject: [PATCH] build: move more options to BuildConfig

---
 build.zig            | 14 +++++---------
 src/build_config.zig |  6 ++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.zig b/build.zig
index 3ee3cf9de..490600d3a 100644
--- a/build.zig
+++ b/build.zig
@@ -36,8 +36,6 @@ comptime {
 const app_version = std.SemanticVersion{ .major = 0, .minor = 1, .patch = 0 };
 
 /// Build options, see the build options help for more info.
-var flatpak: bool = false;
-var libadwaita: bool = false;
 var config: BuildConfig = .{};
 
 pub fn build(b: *std.Build) !void {
@@ -60,7 +58,7 @@ pub fn build(b: *std.Build) !void {
     var env = try std.process.getEnvMap(b.allocator);
     defer env.deinit();
 
-    flatpak = b.option(
+    config.flatpak = b.option(
         bool,
         "flatpak",
         "Build for Flatpak (integrates with Flatpak APIs). Only has an effect targeting Linux.",
@@ -84,7 +82,7 @@ pub fn build(b: *std.Build) !void {
         "The app runtime to use. Not all values supported on all platforms.",
     ) orelse renderer.Impl.default(target.result, wasm_target);
 
-    libadwaita = b.option(
+    config.libadwaita = b.option(
         bool,
         "gtk-libadwaita",
         "Enables the use of libadwaita when using the gtk rendering backend.",
@@ -196,8 +194,6 @@ pub fn build(b: *std.Build) !void {
         "{}",
         .{version},
     ));
-    exe_options.addOption(bool, "flatpak", flatpak);
-    exe_options.addOption(bool, "libadwaita", libadwaita);
 
     // Exe
     if (exe_) |exe| {
@@ -411,7 +407,7 @@ pub fn build(b: *std.Build) !void {
         // https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html
 
         // Desktop file so that we have an icon and other metadata
-        if (flatpak) {
+        if (config.flatpak) {
             b.installFile("dist/linux/app-flatpak.desktop", "share/applications/com.mitchellh.ghostty.desktop");
         } else {
             b.installFile("dist/linux/app.desktop", "share/applications/com.mitchellh.ghostty.desktop");
@@ -870,7 +866,7 @@ fn addDeps(
 
         // When we're targeting flatpak we ALWAYS link GTK so we
         // get access to glib for dbus.
-        if (flatpak) step.linkSystemLibrary2("gtk4", dynamic_link_opts);
+        if (config.flatpak) step.linkSystemLibrary2("gtk4", dynamic_link_opts);
 
         switch (config.app_runtime) {
             .none => {},
@@ -882,7 +878,7 @@ fn addDeps(
 
             .gtk => {
                 step.linkSystemLibrary2("gtk4", dynamic_link_opts);
-                if (libadwaita) step.linkSystemLibrary2("adwaita-1", dynamic_link_opts);
+                if (config.libadwaita) step.linkSystemLibrary2("adwaita-1", dynamic_link_opts);
             },
         }
     }
diff --git a/src/build_config.zig b/src/build_config.zig
index 312b54378..f8b2c8553 100644
--- a/src/build_config.zig
+++ b/src/build_config.zig
@@ -18,6 +18,8 @@ const rendererpkg = @import("renderer.zig");
 /// between options, make it easy to copy and mutate options for different
 /// build types, etc.
 pub const BuildConfig = struct {
+    flatpak: bool = false,
+    libadwaita: bool = false,
     app_runtime: apprt.Runtime = .none,
     renderer: rendererpkg.Impl = .opengl,
     font_backend: font.Backend = .freetype,
@@ -26,6 +28,8 @@ pub const BuildConfig = struct {
     pub fn addOptions(self: BuildConfig, step: *std.Build.Step.Options) void {
         // We need to break these down individual because addOption doesn't
         // support all types.
+        step.addOption(bool, "flatpak", self.flatpak);
+        step.addOption(bool, "libadwaita", self.libadwaita);
         step.addOption(apprt.Runtime, "app_runtime", self.app_runtime);
         step.addOption(font.Backend, "font_backend", self.font_backend);
         step.addOption(rendererpkg.Impl, "renderer", self.renderer);
@@ -34,6 +38,8 @@ pub const BuildConfig = struct {
     /// Rehydrate our BuildConfig from the comptime options.
     pub fn fromOptions() BuildConfig {
         return .{
+            .flatpak = options.flatpak,
+            .libadwaita = options.libadwaita,
             .app_runtime = std.meta.stringToEnum(apprt.Runtime, @tagName(options.app_runtime)).?,
             .font_backend = std.meta.stringToEnum(font.Backend, @tagName(options.font_backend)).?,
             .renderer = std.meta.stringToEnum(rendererpkg.Impl, @tagName(options.renderer)).?,