From e65825ca9ef935a3219c5a3e81a42b747e04e58b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 5 Aug 2023 21:36:54 +0100
Subject: fish: add default for `babelfishPackage`

This option should probably be dropped but I'd prefer to batch that
with using Babelfish by default (or unconditionally, as Home Manager
does) so as to avoid multiple independent breaking changes.

Fixes: #632
---
 modules/programs/fish.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/programs')

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 434449f..c6fb74e 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -68,6 +68,7 @@ in
 
       babelfishPackage = mkOption {
         type = types.package;
+        default = pkgs.babelfish;
         description = lib.mdDoc ''
           The babelfish package to use when useBabelfish is
           set to true.
-- 
cgit v1.2.3


From e2187d633ca8e156e8810af29da39692a30c37d1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 5 Aug 2023 22:57:44 +0100
Subject: fish: simplify `babelfishTranslate`

---
 modules/programs/fish.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/programs')

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index c6fb74e..287cc71 100644
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@@ -37,9 +37,9 @@ let
     '';
 
   babelfishTranslate = path: name:
-    pkgs.runCommand "${name}.fish" {
-      nativeBuildInputs = [ cfg.babelfishPackage ];
-    } "${cfg.babelfishPackage}/bin/babelfish < ${path} > $out;";
+    pkgs.runCommand "${name}.fish" {} ''
+      ${cfg.babelfishPackage}/bin/babelfish < ${path} > $out
+    '';
 
 in
 
-- 
cgit v1.2.3