Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

drop system-package option

Browse Source
This commit is contained in:
Jeffrey C. Ollie
2025-06-25 10:24:47 -05:00
committed by Mitchell Hashimoto
parent cf561fcc55
commit 9c95ce28ae
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PACKAGING.md
View File

@ -83,8 +83,7 @@ zig build \
--prefix /usr \ --prefix /usr \
--system /tmp/offline-cache/p \ --system /tmp/offline-cache/p \
-Doptimize=ReleaseFast \ -Doptimize=ReleaseFast \
-Dcpu=baseline \ -Dcpu=baseline
-Dsystem-package=true
``` ```
The build options are covered in the next section, but this will build The build options are covered in the next section, but this will build

1
nix/package.nix
View File

@ -99,7 +99,6 @@ in
"-Dgtk-x11=${lib.boolToString enableX11}" "-Dgtk-x11=${lib.boolToString enableX11}"
"-Dgtk-wayland=${lib.boolToString enableWayland}" "-Dgtk-wayland=${lib.boolToString enableWayland}"
"-Dstrip=${lib.boolToString strip}" "-Dstrip=${lib.boolToString strip}"
"-Dsystem-package=true"
]; ];
outputs = [ outputs = [

9
src/build/Config.zig
View File

@ -45,7 +45,6 @@ version: std.SemanticVersion = .{ .major = 0, .minor = 0, .patch = 0 },
pie: bool = false, pie: bool = false,
strip: bool = false, strip: bool = false,
patch_rpath: ?[]const u8 = null, patch_rpath: ?[]const u8 = null,
system_package: bool = false,
/// Artifacts /// Artifacts
flatpak: bool = false, flatpak: bool = false,
@ -88,11 +87,7 @@ pub fn init(b: *std.Build) !Config {
// This is set to true when we're building a system package. For now // This is set to true when we're building a system package. For now
// this is trivially detected using the "system_package_mode" bool // this is trivially detected using the "system_package_mode" bool
// but we may want to make this more sophisticated in the future. // but we may want to make this more sophisticated in the future.
const system_package = b.option( const system_package = b.graph.system_package_mode;
bool,
"system-package",
"Controls whether we build a system package",
) orelse b.graph.system_package_mode;
// This specifies our target wasm runtime. For now only one semi-usable // This specifies our target wasm runtime. For now only one semi-usable
// one exists so this is hardcoded. // one exists so this is hardcoded.
@ -266,8 +261,6 @@ pub fn init(b: *std.Build) !Config {
.ReleaseFast, .ReleaseSmall => true, .ReleaseFast, .ReleaseSmall => true,
}; };
config.system_package = system_package;
//--------------------------------------------------------------- //---------------------------------------------------------------
// Artifacts to Emit // Artifacts to Emit

2
src/build/GhosttyResources.zig
View File

@ -267,7 +267,7 @@ pub fn init(b: *std.Build, cfg: *const Config) !GhosttyResources {
b.fmt( b.fmt(
"{s}/systemd/user/com.mitchellh.ghostty{s}.service", "{s}/systemd/user/com.mitchellh.ghostty{s}.service",
.{ .{
if (cfg.system_package) "lib" else "share", if (b.graph.system_package_mode) "lib" else "share",
switch (cfg.optimize) { switch (cfg.optimize) {
.Debug, .ReleaseSafe => "-debug", .Debug, .ReleaseSafe => "-debug",
.ReleaseFast, .ReleaseSmall => "", .ReleaseFast, .ReleaseSmall => "",