From f618621884d5954d696848f011a61b5025a3bcbd Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 20 Mar 2026 09:59:18 +0800
Subject: [PATCH] awscli2: fix zsh completion

---
 pkgs/by-name/aw/awscli2/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 7557d14a22b6..027114392ff2 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -125,9 +125,15 @@ py.pkgs.buildPythonApplication rec {
   ];
 
   postInstall = ''
+    cat > aws.zsh <<EOF
+    #compdef aws
+    autoload -U +X bashcompinit && bashcompinit
+    complete -C $out/bin/aws_completer aws
+    EOF
+
     installShellCompletion --cmd aws \
       --bash <(echo "complete -C $out/bin/aws_completer aws") \
-      --zsh $out/bin/aws_zsh_completer.sh
+      --zsh aws.zsh
   ''
   + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
     rm $out/bin/aws.cmd