From 98ee102955153fa7e5c222a5a2c7d7cb946644a0 Mon Sep 17 00:00:00 2001
From: aiotter <git@aiotter.com>
Date: Thu, 14 Jul 2022 13:38:53 +0900
Subject: [PATCH 1/2] zig: build for darwin

---
 pkgs/development/compilers/zig/default.nix | 5 +----
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index a2cd8f44ce28..d1037687394e 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , fetchFromGitHub
 , cmake
 , llvmPackages
@@ -6,9 +7,6 @@
 , zlib
 }:
 
-let
-  inherit (llvmPackages) stdenv;
-in
 stdenv.mkDerivation rec {
   pname = "zig";
   version = "0.9.1";
@@ -52,6 +50,5 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ andrewrk AndersonTorres ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62fe8ba56ae4..c7739e792410 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21678,6 +21678,7 @@ with pkgs;
   libzra = callPackage ../development/libraries/libzra { };
 
   zig = callPackage ../development/compilers/zig {
+    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     llvmPackages = llvmPackages_13;
   };
 

From 036b52f824eb2aa8013860eddc7cdc31d2fd680d Mon Sep 17 00:00:00 2001
From: aiotter <git@aiotter.com>
Date: Sat, 16 Jul 2022 14:43:14 +0900
Subject: [PATCH 2/2] maintainers: add aiotter

---
 maintainers/maintainer-list.nix            | 6 ++++++
 pkgs/development/compilers/zig/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6d9da62e2ddf..0fd4ab1f0533 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -417,6 +417,12 @@
     githubId = 4732885;
     name = "Ivan Jager";
   };
+  aiotter = {
+    email = "git@aiotter.com";
+    github = "aiotter";
+    githubId = 37664775;
+    name = "Yuto Oguchi";
+  };
   airwoodix = {
     email = "airwoodix@posteo.me";
     github = "airwoodix";
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index d1037687394e..d64c002bf7df 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     description =
       "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
     license = licenses.mit;
-    maintainers = with maintainers; [ andrewrk AndersonTorres ];
+    maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ];
     platforms = platforms.unix;
   };
 }