Merge pull request #253336 from reckenrode/zsh-fix

zsh: fix configure script with clang 16

1 files changed, 7 insertions, 0 deletions

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index d2bdd5d34d22c..4a05ee9ead57f 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -30,6 +30,13 @@ stdenv.mkDerivation {
   patches = [
     # fix location of timezone data for TZ= completion
     ./tz_completion.patch
+    # Fixes configure misdetection when using clang 16, resulting in broken subshells on Darwin.
+    # This patch can be dropped with the next release of zsh.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch";
+      hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
+      excludes = [ "ChangeLog" ];
+    })
   ];
 
   strictDeps = true;