mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-07-16 00:36:07 +03:00
Merge pull request #1528 from der-teufel-programming/fix-compress
Update to new compress.zlib API
This commit is contained in:
@ -24,7 +24,7 @@ const Command = @import("src/Command.zig");
|
||||
// but we liberally update it. In the future, we'll be more careful about
|
||||
// using released versions so that package managers can integrate better.
|
||||
comptime {
|
||||
const required_zig = "0.12.0-dev.2711+f995c1b08";
|
||||
const required_zig = "0.12.0-dev.2818+97290e0bf";
|
||||
const current_zig = builtin.zig_version;
|
||||
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
|
||||
if (current_zig.order(min_zig) == .lt) {
|
||||
@ -272,7 +272,6 @@ pub fn build(b: *std.Build) !void {
|
||||
exe.want_lto = false;
|
||||
}
|
||||
|
||||
|
||||
// If we're installing, we get the install step so we can add
|
||||
// additional dependencies to it.
|
||||
const install_step = if (config.app_runtime != .none) step: {
|
||||
|
12
flake.lock
generated
12
flake.lock
generated
@ -147,11 +147,11 @@
|
||||
},
|
||||
"nixpkgs-zig-0-12": {
|
||||
"locked": {
|
||||
"lastModified": 1707846486,
|
||||
"narHash": "sha256-ek2NESo8WPqUIuUPVs3L2rliCFofvjhR/i3ptaxfaJ4=",
|
||||
"lastModified": 1708536163,
|
||||
"narHash": "sha256-UdGZLYXoIJRal/J/uYlMqPi27LE92wdsIHtDOWRVXhM=",
|
||||
"owner": "vancluever",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "31119ca40f326e3a6552883fa62f2df56c17a7bf",
|
||||
"rev": "aba18e2126357afc8a997c12dcf027517b7432b0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -194,11 +194,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707783766,
|
||||
"narHash": "sha256-kD90pK+KAzr3UrohYRqE7fWUaEg4Mv3rk1IhubiHFUM=",
|
||||
"lastModified": 1708474925,
|
||||
"narHash": "sha256-ejcMwYdCnCNxaQ7G1hTo6G33iI+hcfHsCJYskDVssyw=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "06f4507d05f90a54409a5206fcfba5966eea0c03",
|
||||
"rev": "f28aea5eeaeafed3d9be7d7ac920df95d1ebd376",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -346,11 +346,7 @@ pub const LoadingImage = struct {
|
||||
fn decompressZlib(self: *LoadingImage, alloc: Allocator) !void {
|
||||
// Open our zlib stream
|
||||
var fbs = std.io.fixedBufferStream(self.data.items);
|
||||
var stream = std.compress.zlib.decompressStream(alloc, fbs.reader()) catch |err| {
|
||||
log.warn("zlib decompression failed: {}", .{err});
|
||||
return error.DecompressionFailed;
|
||||
};
|
||||
defer stream.deinit();
|
||||
var stream = std.compress.zlib.decompressor(fbs.reader());
|
||||
|
||||
// Write it to an array list
|
||||
var list = std.ArrayList(u8).init(alloc);
|
||||
|
Reference in New Issue
Block a user