diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d74d0490b4090..5ddbe1a7c0461 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -373,9 +373,7 @@ stdenv.mkDerivation {
     ''
     + optionalString (libcxx.isLLVM or false) (''
       echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
-      echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
-    '' + lib.optionalString stdenv.targetPlatform.isLinux ''
-      echo "-lc++abi" >> $out/nix-support/libcxx-ldflags
+      echo "-stdlib=libc++ -lc++abi" >> $out/nix-support/libcxx-ldflags
     '')
 
     ##
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index a2cd8f44ce283..9704faeb5c68a 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -52,6 +52,6 @@ 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
+    broken = stdenv.isDarwin && !stdenv.isAarch64; # See https://github.com/NixOS/nixpkgs/issues/86299
   };
 }