From 94b2a0056a71e8fbf8a14eb43c2d8592202d3389 Mon Sep 17 00:00:00 2001
From: Krzysztof Wolicki <der.teufel.mail@gmail.com>
Date: Wed, 3 Jan 2024 14:58:26 +0100
Subject: [PATCH 1/3] Update to latest master after Zig PR #18160

---
 build.zig     | 2 +-
 build.zig.zon | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.zig b/build.zig
index 109adac..2fa7265 100644
--- a/build.zig
+++ b/build.zig
@@ -4,7 +4,7 @@ pub fn build(b: *std.Build) void {
     const optimize = b.standardOptimizeOption(.{});
     const target = b.standardTargetOptions(.{});
 
-    _ = b.addModule("objc", .{ .source_file = .{ .path = "src/main.zig" } });
+    _ = b.addModule("objc", .{ .root_source_file = .{ .path = "src/main.zig" } });
 
     const tests = b.addTest(.{
         .name = "objc-test",
diff --git a/build.zig.zon b/build.zig.zon
index 6c497cb..d6b5f86 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -10,8 +10,8 @@
     },
     .dependencies = .{
         .macos_sdk = .{
-            .url = "https://github.com/mitchellh/zig-build-macos-sdk/archive/7e50d6ea241403615d5ebc9f1df4680d3907fa92.tar.gz",
-            .hash = "1220eb266898413ecfe5aaf7f29cc17eb479d046adecc94ebc7d5e1e807d2aabdd70",
+            .url = "https://github.com/mitchellh/zig-build-macos-sdk/archive/4186e9fd445d12041651abe59ea5f396499b0844.tar.gz",
+            .hash = "1220bc2612b57b0cfaaecbcac38e3144e5a9362ff668d71eb8334e895047bdbb7148",
         },
     },
 }

From 3f92c2dbde9a0145b7b2a8e01f76f4e77c8e6a87 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 5 Jan 2024 19:25:16 -0800
Subject: [PATCH 2/3] update zig

---
 flake.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8bd21fe..2f2ffe2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,16 +80,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1689088367,
-        "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=",
+        "lastModified": 1702350026,
+        "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8",
+        "rev": "9463103069725474698139ab10f17a9d125da859",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.05",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -109,11 +109,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1700526194,
-        "narHash": "sha256-/7C9bzFG0Gq/tBAbSwC84Dg5TNPomCcxIJJQNj3Y2BI=",
+        "lastModified": 1704500574,
+        "narHash": "sha256-Ockm1D5QsxdVZZoD0Yf5Kg4FupbVnk3X0RLkc6geRIE=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "2877b025231e96196469ee8a5b80799027b42e03",
+        "rev": "e056aafd8db157ff7519518a026c5ba7040522cf",
         "type": "github"
       },
       "original": {

From 9c45d3667366ea5c1b0ae3a5a973c3ec88ae61fe Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 5 Jan 2024 20:34:36 -0800
Subject: [PATCH 3/3] change pointer type to workaround zig bug

---
 src/block.zig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/block.zig b/src/block.zig
index e035e59..92eec34 100644
--- a/src/block.zig
+++ b/src/block.zig
@@ -200,7 +200,9 @@ fn BlockContext(comptime Captures: type, comptime InvokeFn: type) type {
     });
 }
 
-const NSConcreteStackBlock = @extern(*anyopaque, .{ .name = "_NSConcreteStackBlock" });
+// Pointer to opaque instead of anyopaque: https://github.com/ziglang/zig/issues/18461
+const NSConcreteStackBlock = @extern(*opaque {}, .{ .name = "_NSConcreteStackBlock" });
+
 extern "C" fn _Block_object_assign(dst: *anyopaque, src: *const anyopaque, flag: c_int) void;
 extern "C" fn _Block_object_dispose(src: *const anyopaque, flag: c_int) void;