update to Zig 0.17.0

Author: techatrix

README.md

@@ -21,6 +21,10 @@ const libxkbcommon_dependency = b.dependency("libxkbcommon", .{
     .target = target,
     .optimize = optimize,
 
+    // The system install prefix. Defaults to `/usr` which matches most distributions.
+    // This does not work on distributions that don't follow the Filesystem Hierarchy Standard (FHS) like NixOS.
+    // .@"install-prefix" = "/usr/local/",
+
     // Set the XKB config root.
     // Will default to "${INSTALL_PREFIX}/share/X11/xkb" i.e. `zig-out/share/X11/xkb`.
     // Most distributions will use `/usr/share/X11/xkb`.
@@ -46,4 +50,4 @@ const libxkbcommon_dependency = b.dependency("libxkbcommon", .{
 your_exe.linkLibrary(libxkbcommon_dependency.artifact("libxkbcommon"));
 ```
 
-For more information, please refer to the [User-configuration](https://github.com/xkbcommon/libxkbcommon/blob/master/doc/user-configuration.md) docs of libxkbcommon.
+For more information, please refer to the [XKB data locations](https://github.com/xkbcommon/libxkbcommon/blob/master/doc/custom-configuration.md#xkb-data-locations) docs of libxkbcommon.

build.zig

@@ -30,10 +30,13 @@ pub fn build(b: *std.Build) void {
 
     // Most of these config options have not been tested.
 
-    const xkb_legacy_root = b.option([]const u8, "xkb-legacy-root", " [default=$prefix/share/X11/locale]") orelse b.pathJoin(&.{ b.install_prefix, "share/X11/xkb" });
-    const xkb_config_root = b.option([]const u8, "xkb-config-root", "The XKB config root [default=$prefix/share/X11/locale]") orelse xkb_legacy_root;
+    // This should use a lazy path instead: `std.Build.LazyPath{ .relative = .{ .base = .install_prefix } }`.
+    const install_prefix = b.option([]const u8, "install-prefix", "[default=/usr]") orelse "/usr";
+
+    const xkb_legacy_root = b.option([]const u8, "xkb-legacy-root", " [default=$prefix/share/X11/xkb]") orelse b.pathJoin(&.{ install_prefix, "share/X11/xkb" });
+    const xkb_config_root = b.option([]const u8, "xkb-config-root", "The XKB config root [default=$prefix/share/X11/xkb]") orelse xkb_legacy_root;
     const xkb_config_extra_path = b.option([]const u8, "xkb-config-extra-path", "Extra lookup path for system-wide XKB data [default=$sysconfdir/xkb]") orelse "/etc/xkb";
-    const x_locale_root = b.option([]const u8, "x-locale-root", "The X locale root [default=$prefix/share/X11/locale]") orelse b.pathJoin(&.{ b.install_prefix, "share/X11/locale" });
+    const x_locale_root = b.option([]const u8, "x-locale-root", "The X locale root [default=$prefix/share/X11/locale]") orelse b.pathJoin(&.{ install_prefix, "share/X11/locale" });
     // const bash_completion_path = b.option([]const u8, "bash-completion-path", "Directory for bash completion scripts");
     const default_rules = b.option([]const u8, "default-rules", "Default XKB ruleset") orelse "evdev";
     const default_model = b.option([]const u8, "default-model", "Default XKB model") orelse "pc105";
@@ -51,7 +54,7 @@ pub fn build(b: *std.Build) void {
     const config_header = b.addConfigHeader(.{}, .{
         .EXIT_INVALID_USAGE = 2,
         .LIBXKBCOMMON_VERSION = b.fmt("{f}", .{version}),
-        .LIBXKBCOMMON_TOOL_PATH = b.pathJoin(&.{ b.install_prefix, "libexec/xkbcommon" }),
+        .LIBXKBCOMMON_TOOL_PATH = b.pathJoin(&.{ install_prefix, "libexec/xkbcommon" }),
         ._GNU_SOURCE = 1,
         .DFLT_XKB_LEGACY_ROOT = xkb_legacy_root,
         .DFLT_XKB_CONFIG_ROOT = xkb_config_root,
@@ -101,8 +104,8 @@ pub fn build(b: *std.Build) void {
         update.addCopyFileToSource(generated_parser_c, "parser.c");
         update.addCopyFileToSource(generated_parser_h, "parser.h");
     } else {
-        update_parser.addError("unable to find bison in $PATH or search prefixes (--search-prefix)", .{}) catch {};
-        update_parser.addError("parser.c and parser.h could not be updated", .{}) catch {};
+        update_parser.dependOn(&b.addFail("unable to find bison in $PATH or search prefixes (--search-prefix)").step);
+        update_parser.dependOn(&b.addFail("parser.c and parser.h could not be updated").step);
     }
 
     const use_system_bison = b.systemIntegrationOption("bison", .{});
@@ -227,7 +230,7 @@ fn generateParser(
 
     const run_step = std.Build.Step.Run.create(b, "run bison");
     run_step.setCwd(parser_write_files.getDirectory());
-    run_step.addFileArg(.{ .cwd_relative = b.findProgram(&.{ "bison", "win_bison" }, &.{}) catch return null });
+    run_step.addFileArg(.{ .cwd_relative = b.findProgram(.{ .names = &.{ "bison", "win_bison" } }) orelse return null });
     run_step.addArg("--defines=parser.h");
     run_step.addArg("-o");
     const parser_c = run_step.addOutputFileArg("parser.c");
@@ -237,7 +240,7 @@ fn generateParser(
     const write_header = b.addWriteFiles();
     write_header.step.dependOn(&run_step.step);
     const parser_h = write_header.addCopyFile(
-        .{ .generated = .{ .file = &parser_write_files.generated_directory, .sub_path = "parser.h" } },
+        .{ .generated = .{ .index = parser_write_files.generated_directory, .sub_path = "parser.h" } },
         "parser.h",
     );
 

build.zig.zon

@@ -1,7 +1,7 @@
 .{
     .name = .libxkbcommon,
     .version = "1.13.2",
-    .minimum_zig_version = "0.16.0",
+    .minimum_zig_version = "0.17.0",
     .dependencies = .{
         .libxkbcommon = .{
             .url = "git+https://github.com/xkbcommon/libxkbcommon.git?ref=xkbcommon-1.13.2#d1442aaa6b635551182e83c3b55037f4c118c962",