programs/my-theme: Migrate to Zig v0.15

Changes

4 changed files (+28/-10)

• programs/theme/build.zig
  • @@ -47,11 +47,15 @@ "tzdir",
    if (tzdir) |slice| try b.allocator.dupeZ(u8, slice) else null, ); - const exe = b.addExecutable(.{ - .name = ",theme", + const main = b.createModule(.{ .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, + }); + + const exe = b.addExecutable(.{ + .name = ",theme", + .root_module = main, }); exe.root_module.addOptions("config", config);
  • @@ -77,9 +81,7 @@ {
    const step = b.step("test", "Run unit tests"); const t = b.addTest(.{ - .root_source_file = b.path("src/main.zig"), - .target = target, - .optimize = optimize, + .root_module = main, }); t.linkLibC();
• programs/theme/default.nix
  • @@ -15,13 +15,14 @@ #
    # SPDX-License-Identifier: Apache-2.0 { + lib, glib, sunwait, tzdata, pkg-config, stdenvNoCC, installShellFiles, - zig_0_14, + zig, }: stdenvNoCC.mkDerivation rec { pname = "my-theme";
  • @@ -33,13 +34,21 @@ tzdata
    ]; nativeBuildInputs = [ pkg-config - zig_0_14.hook + zig.hook installShellFiles ]; zigBuildFlags = [ "-Dtzdir=${tzdata}/share/zoneinfo" ]; - src = ./.; + src = + with lib.fileset; + toSource { + root = ./.; + fileset = unions [ + ./src + ./build.zig + ]; + }; meta = { mainProgram = ",theme";
• programs/theme/src/gnome.zig
  • @@ -57,7 +57,12 @@ defer allocator.free(run_result.stdout);
    defer allocator.free(run_result.stderr); if (run_result.stderr.len > 0) { - std.io.getStdErr().writeAll(run_result.stderr) catch {}; + var stdout_writer = std.fs.File.stderr().writer(&.{}); + const stdout = &stdout_writer.interface; + + stdout.writeAll(run_result.stderr) catch |err| { + std.log.err("Failed to write to stderr: {t}", .{err}); + }; } switch (run_result.term) {
• programs/theme/src/main.zig
  • @@ -150,7 +150,9 @@ return ExitCode.generic_error.to_u8();
    }; defer file.close(); - var config_reader = std.json.reader(allocator, file.reader()); + var read_buffer: [1024]u8 = undefined; + var file_reader = file.reader(&read_buffer); + var config_reader = std.json.Reader.init(allocator, &file_reader.interface); defer config_reader.deinit(); const config = std.json.parseFromTokenSource(Config, allocator, &config_reader, .{}) catch |err| { std.log.err("Unable to parse config file at {s}: {s}", .{ config_path, @errorName(err) });