From 4ceb1c03622aa56bb833d2618a47d2311109986f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 7 Sep 2022 14:30:38 -0400
Subject: [PATCH 1/2] cargo-zigbuild: init at 0.12.0

---
 .../tools/rust/cargo-zigbuild/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-zigbuild/default.nix

diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
new file mode 100644
index 000000000000..19dd70c3e488
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -0,0 +1,29 @@
+{ lib, rustPlatform, fetchFromGitHub, makeWrapper, zig }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-zigbuild";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "messense";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-nBncU5rM3gS5e/Qs14U/ZwAkLFLdNuO2DhSQW+7xGQk=";
+  };
+
+  cargoSha256 = "sha256-Zq+RG36aeNd8G+LSdiyLK8SYC0MckGUIBTvia4H9OJY=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/cargo-zigbuild \
+      --prefix PATH : ${zig}/bin
+  '';
+
+  meta = with lib; {
+    description = "A tool to compile Cargo project with zig as linker";
+    homepage = "https://github.com/messense/cargo-zigbuild";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00a1836c806f..7080a68cf565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14579,6 +14579,8 @@ with pkgs;
 
   cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
 
+  cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { };
+
   crate2nix = callPackage ../development/tools/rust/crate2nix { };
 
   convco = callPackage ../development/tools/convco {

From 8f51aaae0cf24af9bfc0c6d32fceaaccfdf8695f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 8 Sep 2022 10:15:56 -0400
Subject: [PATCH 2/2] cargo-zigbuild: fix grammar in description

---
 pkgs/development/tools/rust/cargo-zigbuild/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index 19dd70c3e488..ce6cd32fa553 100644
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "A tool to compile Cargo project with zig as linker";
+    description = "A tool to compile Cargo projects with zig as the linker";
     homepage = "https://github.com/messense/cargo-zigbuild";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];