From f21847f019c57ed1afe9776493bf0bd438e6ad31 Mon Sep 17 00:00:00 2001
From: Willi Carlsen <carlsenwilli@gmail.com>
Date: Thu, 6 Mar 2025 00:04:21 +0100
Subject: [PATCH] granted: remove withFish flag completely (#387013)

* Remove withFish flag completely

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>

* granted: remove 'withFish' flag

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>

---------

Signed-off-by: Willi Carlsen <carlsenwilli@gmail.com>
---
 pkgs/by-name/gr/granted/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 6eeb315d27a8..1339b6dfdcf6 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -4,9 +4,6 @@
   nix-update-script,
   versionCheckHook,
 
-  withFish ? false,
-  fish,
-
   lib,
   makeWrapper,
   xdg-utils,
@@ -75,12 +72,11 @@ buildGoModule rec {
 
       # Insert below the #!/bin/sh shebang
       echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
-    ''
-    + lib.optionalString withFish ''
+
       # Install fish script
       install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
       substituteInPlace $out/share/assume.fish \
-        --replace /bin/fish ${fish}/bin/fish
+        --replace-fail "#!/bin/fish" "#!/usr/bin/env fish"
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];