Unverified Commit f3ff5509 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #233429 from wegank/fzf-fish-darwin 

fishPlugins.fzf-fish: use script from unixtools
parents 268367d3 4a2a84f2

pkgs/shells/fish/plugins/fzf-fish.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, pkgs, buildFishPlugin, fetchFromGitHub, fd, util-linux, procps, clownfish, fishtape_3, }:

{ lib, stdenv, pkgs, buildFishPlugin, fetchFromGitHub, fd, unixtools, procps, clownfish, fishtape_3, }:

let

  # we want `pkgs.fzf`, not `fishPlugins.fzf`

  inherit (pkgs) fzf;
@@ -14,7 +14,7 @@ buildFishPlugin rec { 
    sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo=";

  };



  nativeCheckInputs = [ fzf fd util-linux procps ];

  nativeCheckInputs = [ fzf fd unixtools.script procps ];

  checkPlugins = [ clownfish fishtape_3 ];

  checkFunctionDirs = [ "./functions" ];

  checkPhase = ''