about summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2023-09-04 19:27:25 -0400
committerRandy Eckenrode <randy@largeandhighquality.com>2023-09-04 19:42:32 -0400
commit0401989eb975f53fe7ddb4a8e103c4c5186bc445 (patch)
tree38802758245a8d4413a0b5d9c0ce920544f94fc2 /pkgs/shells
parentdba6d77ad232e3a5ffc5e281ebbada4fe0e23981 (diff)
zsh: fix configure script with clang 16
While zsh builds, the resulting zsh is broken on Darwin.
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/zsh/default.nix7
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;