From 8e3c8b4d87f723c3423d9a759de930edce45f366 Mon Sep 17 00:00:00 2001
From: "haozhe.yang" <yanghaozhe@moonshot.ai>
Date: Thu, 4 Jun 2026 16:23:30 +0800
Subject: [PATCH 1/2] fix(nix): expose ripgrep and fd to wrapped kimi

- make wrapper available to the Nix build
- wrap kimi binary with ripgrep and fd on PATH
- include rg and fd in the dev shell packages
---
 flake.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/flake.nix b/flake.nix
index 0007040d63..78092b71e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -147,6 +147,7 @@
               nodejs
               pnpm
               (pkgs.pnpmConfigHook.override { inherit pnpm; })
+              pkgs.makeWrapper
             ]
             # The SEA inject step (postject) invalidates the macOS code
             # signature on the copied Node executable; build.mjs then re-applies
@@ -190,6 +191,10 @@
               runHook postInstall
             '';
 
+            postInstall = ''
+              wrapProgram $out/bin/kimi --prefix PATH : ${lib.makeBinPath [ pkgs.ripgrep pkgs.fd ]}
+            '';
+
             meta = {
               description = "Kimi Code CLI";
               homepage = "https://github.com/MoonshotAI/kimi-code";
@@ -223,6 +228,8 @@
             packages = [
               nodejs
               pnpm
+              pkgs.ripgrep
+              pkgs.fd
             ];
           };
       });

From 4098c85289d97543ac7bd409127f7bdc51f326a9 Mon Sep 17 00:00:00 2001
From: "haozhe.yang" <yanghaozhe@moonshot.ai>
Date: Thu, 4 Jun 2026 19:30:51 +0800
Subject: [PATCH 2/2] chore(nix): add changeset for ripgrep and fd

---
 .changeset/nix-cli-tool-path.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/nix-cli-tool-path.md

diff --git a/.changeset/nix-cli-tool-path.md b/.changeset/nix-cli-tool-path.md
new file mode 100644
index 0000000000..8b11be0a70
--- /dev/null
+++ b/.changeset/nix-cli-tool-path.md
@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Ensure Nix-packaged CLI builds can find ripgrep and fd.