- Update libxev dependency

- Fixup macos compile error
ghostty-org · Nov 1, 2023 · a3b77dd · a3b77dd
1 parent 073e5dc
commit a3b77dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build.zig.zon b/build.zig.zon
@@ -5,8 +5,8 @@
     .dependencies = .{
         // Zig libs
         .libxev = .{
-            .url = "https://github.com/kcbanner/libxev/archive/d71ddeb19c6697875c2e0e68a49d04c05bc26199.tar.gz",
-            .hash = "1220a26265c30f5677ce28daf04afbd7a6ef5a17f5d3b5506f767fdfee7dc4225d2b",
+            .url = "https://github.com/mitchellh/libxev/archive/1b46c2d6f32754a3029d1863275dd0f877163831.tar.gz",
+            .hash = "12208dc0796bffa6ea9edb60193108e34f835f35fc152e853717aca2b13ba17f3be2",
         },
         .mach_glfw = .{
             .url = "https://github.com/hexops/mach-glfw/archive/16dc95cc7f74ebbbdd848d9a2c3cc4afc5717708.tar.gz",

diff --git a/src/os/locale.zig b/src/os/locale.zig
@@ -21,8 +21,10 @@ pub fn ensureLocale(alloc: std.mem.Allocator) !void {
     // process.
     if (comptime builtin.target.isDarwin()) {
         // Set the lang if it is not set or if its empty.
-        if (lang.len == 0) {
-            setLangFromCocoa();
+        if (lang) |l| {
+            if (l.len == 0) {
+                setLangFromCocoa();
+            }
         }
     }
 
@@ -98,7 +100,7 @@ fn setLangFromCocoa() void {
     log.info("detected system locale={s}", .{env_value});
 
     // Set it onto our environment
-    if (internal_os.setEnv("LANG", env_value.ptr) < 0) {
+    if (internal_os.setEnv("LANG", env_value) < 0) {
         log.err("error setting locale env var", .{});
         return;
     }