From b7fb2057f7163acc07b7f4c5a12d07e5ba85ae78 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 8 Mar 2024 23:44:33 -0700 Subject: [PATCH] fix x86_64-linux-gnu build Signed-off-by: Stephen Gutekanst --- build.zig | 3 +++ src/core/platform/glfw/Core.zig | 2 +- src/sysaudio/alsa.zig | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 58dbec15..4ea2fa2b 100644 --- a/build.zig +++ b/build.zig @@ -279,6 +279,9 @@ pub fn build(b: *std.Build) !void { } addPaths(&unit_tests.root_module); + // Linux gamemode requires libc. + if (target.result.os.tag == .linux) unit_tests.root_module.link_libc = true; + // Exposes a `test` step to the `zig build --help` menu, providing a way for the user to // request running the unit tests. const run_unit_tests = b.addRunArtifact(unit_tests); diff --git a/src/core/platform/glfw/Core.zig b/src/core/platform/glfw/Core.zig index 2b13210e..19838431 100644 --- a/src/core/platform/glfw/Core.zig +++ b/src/core/platform/glfw/Core.zig @@ -1317,7 +1317,7 @@ fn detectBackendType(allocator: std.mem.Allocator) !gpu.BackendType { } /// Check if gamemode should be activated -fn wantGamemode(allocator: std.mem.Allocator) error{ OutOfMemory, InvalidUtf8 }!bool { +fn wantGamemode(allocator: std.mem.Allocator) error{ OutOfMemory, InvalidUtf8, InvalidWtf8 }!bool { const use_gamemode = std.process.getEnvVarOwned( allocator, "MACH_USE_GAMEMODE", diff --git a/src/sysaudio/alsa.zig b/src/sysaudio/alsa.zig index a5fd464c..e067753c 100644 --- a/src/sysaudio/alsa.zig +++ b/src/sysaudio/alsa.zig @@ -132,7 +132,7 @@ pub const Context = struct { }; errdefer std.os.inotify_rm_watch(notify_fd, notify_wd); - const notify_pipe_fd = std.os.pipe2(std.os.O.NONBLOCK) catch |err| switch (err) { + const notify_pipe_fd = std.os.pipe2(.{ .NONBLOCK = true }) catch |err| switch (err) { error.ProcessFdQuotaExceeded, error.SystemFdQuotaExceeded, => return error.SystemResources,