public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fzf: fix patch for vim plugin; enable tests; avoid direct $src… (#79575)

Browse Source 
It was previously referencing `$bin`, but this package no longer produces a
`bin` output, just `out` and `share`. Updated to make the comparison check a bit
more robust.

Also updated to avoid direct dependency on the `$src` directory out of the nix
store, instead using the processed src setup in the unpackPhase. This provides a
cleaner abstraction between the build/install phase and the input src phase, and
avoids an unnecessary dependency on whether the source disted tarball comes from
`fetchFromGitHub` (in which case it's an unpacked directory) or something like
`fetchurl`. In either case, stdenv is responsible for processing the input `src`
and setting up a clean build dir for us, so we should use that.

This produces an equivalent directory tree, except that the vim plugin is no
longer broken.
This commit is contained in:
Benjamin Hipple 2020-02-09 18:43:22 -05:00 committed by GitHub
parent 349b471469
commit e85e257ad9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/misc/fzf/default.nix
View File

@ -19,32 +19,34 @@ buildGoModule rec {
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
# The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = '' patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
# Original and output files can't be the same if ! grep -q $out plugin/fzf.vim; then
if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then echo "Failed to replace vim base_dir path with $out"
echo "Vim plugin patch not applied properly. Aborting" && \ exit 1
exit 1
fi fi
''; '';
doCheck = true;
preInstall = '' preInstall = ''
mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d} mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish 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 cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
''; '';
postInstall = '' postInstall = ''
cp $src/bin/fzf-tmux $out/bin cp bin/fzf-tmux $out/bin
mkdir -p $man/share/man mkdir -p $man/share/man
cp -r $src/man/man1 $man/share/man cp -r man/man1 $man/share/man
mkdir -p $out/share/vim-plugins/${pname} mkdir -p $out/share/vim-plugins/${pname}
cp -r $src/plugin $out/share/vim-plugins/${pname} cp -r plugin $out/share/vim-plugins/${pname}
cp -R $src/shell $out/share/fzf cp -R shell $out/share/fzf
cat <<SCRIPT > $out/bin/fzf-share cat <<SCRIPT > $out/bin/fzf-share
#!${runtimeShell} #!${runtimeShell}
# Run this script to find the fzf shared folder where all the shell # Run this script to find the fzf shared folder where all the shell