From a0b66815199d1ff34c8fd11d521902f368f68923 Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Thu, 8 Feb 2024 22:35:51 +0100
Subject: [PATCH] cbuild: add zig_package build style

---
 src/cbuild/build_style/zig_package.py |  5 +++++
 src/cbuild/util/zig_package.py        | 14 ++++++++++++++
 user/zig-wayland/template.py          | 10 ++--------
 user/zig-xkbcommon/template.py        | 10 ++--------
 4 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 src/cbuild/build_style/zig_package.py
 create mode 100644 src/cbuild/util/zig_package.py

diff --git a/src/cbuild/build_style/zig_package.py b/src/cbuild/build_style/zig_package.py
new file mode 100644
index 00000000000..d5b843a6569
--- /dev/null
+++ b/src/cbuild/build_style/zig_package.py
@@ -0,0 +1,5 @@
+from cbuild.util import zig_package
+
+
+def use(tmpl):
+    tmpl.do_install = zig_package.install
diff --git a/src/cbuild/util/zig_package.py b/src/cbuild/util/zig_package.py
new file mode 100644
index 00000000000..3f85c898ae5
--- /dev/null
+++ b/src/cbuild/util/zig_package.py
@@ -0,0 +1,14 @@
+def install(pkg):
+    zig_pkg_hash = pkg.do(
+        "zig",
+        "fetch",
+        "--global-cache-dir",
+        "/tmp",
+        ".",
+        capture_output=True,
+    ).stdout.strip().decode("utf-8")
+
+    pkg.install_files(
+        "/tmp/p/" + zig_pkg_hash,
+        "usr/src/zig/packages/",
+    )
diff --git a/user/zig-wayland/template.py b/user/zig-wayland/template.py
index dd8a5b469a7..ec370b97690 100644
--- a/user/zig-wayland/template.py
+++ b/user/zig-wayland/template.py
@@ -1,6 +1,8 @@
 pkgname = "zig-wayland"
 pkgver = "0.1.0"
 pkgrel = 0
+build_style = "zig_package"
+hostmakedepends = ["zig"]
 pkgdesc = "Zig bindings for libwayland"
 maintainer = "Isaac Freund <mail@isaacfreund.com>"
 license = "MIT"
@@ -9,13 +11,5 @@
 sha256 = "46ce978744d2b4e5ba563b220a9a7a320fc1ea7b15b82800825efd685fa7e0af"
 
 
-def do_install(self):
-    self.install_files(
-        ".",
-        "usr/src/zig/packages/",
-        name="122062beeb6fd2bb21c91e81acb3ea6cbba69d3c00a31b62732254e190b5fc7a934e",
-    )
-
-
 def post_install(self):
     self.install_license("LICENSE")
diff --git a/user/zig-xkbcommon/template.py b/user/zig-xkbcommon/template.py
index 2c764906e52..baefe0365e2 100644
--- a/user/zig-xkbcommon/template.py
+++ b/user/zig-xkbcommon/template.py
@@ -1,6 +1,8 @@
 pkgname = "zig-xkbcommon"
 pkgver = "0.1.0"
 pkgrel = 0
+build_style = "zig_package"
+hostmakedepends = ["zig"]
 pkgdesc = "Zig bindings for xkbcommon"
 maintainer = "Isaac Freund <mail@isaacfreund.com>"
 license = "MIT"
@@ -9,13 +11,5 @@
 sha256 = "9140440d82266b9d912a988a0bb219cd01e65582104f01870cfc3dc47635a9ba"
 
 
-def do_install(self):
-    self.install_files(
-        ".",
-        "usr/src/zig/packages/",
-        name="1220ed0ec8a6cb1990c2f95bfd71fe7f8bcb6b8e4778573f03b3c755ea81fbf74ee8",
-    )
-
-
 def post_install(self):
     self.install_license("LICENSE")