diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-03 06:01:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-03 06:01:28 +0000 |
commit | 7ec41836730f4344e835c1ca06e33d347ff017a6 (patch) | |
tree | c348463f3dbaccc3397afa473ddbb83b7e3d9f16 /pkgs/tools/misc/fzf/default.nix | |
parent | a83c4dd1939293da6ba883d98764c9dc5f14ef74 (diff) | |
parent | 809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/fzf/default.nix')
-rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index aee0121977303..0ea167a5053c3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,5 +1,12 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: - +{ lib +, buildGoModule +, fetchFromGitHub +, writeText +, runtimeShell +, installShellFiles +, ncurses +, perl +}: buildGoModule rec { pname = "fzf"; version = "0.35.1"; @@ -15,7 +22,7 @@ buildGoModule rec { outputs = [ "out" "man" ]; - fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ ncurses ]; @@ -38,22 +45,19 @@ buildGoModule rec { --replace " perl -n " " ${perl}/bin/perl -n " ''; - preInstall = '' - mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d} - cp shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish - cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish - ''; - postInstall = '' - cp bin/fzf-tmux $out/bin + install bin/fzf-tmux $out/bin + + installManPage man/man1/fzf.1 man/man1/fzf-tmux.1 - mkdir -p $man/share/man - cp -r man/man1 $man/share/man + install -D plugin/* -t $out/share/vim-plugins/${pname}/plugin - mkdir -p $out/share/vim-plugins/${pname} - cp -r plugin $out/share/vim-plugins/${pname} + # Install shell integrations + install -D shell/* -t $out/share/fzf/ + install -D shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish + mkdir -p $out/share/fish/vendor_conf.d + echo fzf_key_bindings > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish - cp -R shell $out/share/fzf cat <<SCRIPT > $out/bin/fzf-share #!${runtimeShell} # Run this script to find the fzf shared folder where all the shell |