From fc95fc0b7a9eb35ef25c3706290186fa1a18e41d Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 12 May 2026 01:34:41 -0400
Subject: [PATCH 1/2] fish: Use buildPackages.python3.withPackages

---
 pkgs/by-name/fi/fish/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 9ecccf3a9402..874b108f6471 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  buildPackages,
   coreutils,
   darwin,
   glibcLocales,
@@ -280,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustc
     rustPlatform.cargoSetupHook
-    (python3.withPackages (ps: [
+    (buildPackages.python3.withPackages (ps: [
       ps.pexpect
       ps.sphinx
     ]))

From 3b42c56c435cbbb9162707bc9fe4a53426ccff51 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 12 May 2026 01:48:26 -0400
Subject: [PATCH 2/2] fish: Use native fish for docs building

---
 pkgs/by-name/fi/fish/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 874b108f6471..f75774a57b26 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -9,6 +9,7 @@
   gnused,
   gnugrep,
   gawk,
+  fish,
   man-db,
   ninja,
   getent,
@@ -287,6 +288,13 @@ stdenv.mkDerivation (finalAttrs: {
     ]))
     # Avoid warnings when building the manpages about HOME not being writable
     writableTmpDirAsHomeHook
+  ]
+  ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+    # Building the docs ends up wanting to run fish_indent at build
+    # time, which obviously can't use a cross compiled fish_indent
+    # from this derivation. Pull in the build platform's fish to
+    # provide it.
+    fish
   ];
 
   buildInputs = [