Merge pull request #18605 from LnL7/darwin-fzf
fzf: fix cycle in bin output
This commit is contained in:
commit
992b59c9a1
|
@ -23,12 +23,19 @@ buildGoPackage rec {
|
||||||
sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
|
sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall= ''
|
postInstall = ''
|
||||||
cp $src/bin/fzf-tmux $bin/bin
|
cp $src/bin/fzf-tmux $bin/bin
|
||||||
mkdir -p $out/share/vim-plugins
|
mkdir -p $out/share/vim-plugins
|
||||||
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
|
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
|
# fixes cycle between $out and $bin
|
||||||
|
# otool -l shows that the binary includes an LC_RPATH to $out/lib
|
||||||
|
# it seems safe to remove that since but the directory does not exist.
|
||||||
|
install_name_tool -delete_rpath $out/lib $bin/bin/fzf
|
||||||
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://github.com/junegunn/fzf;
|
homepage = https://github.com/junegunn/fzf;
|
||||||
description = "A command-line fuzzy finder written in Go";
|
description = "A command-line fuzzy finder written in Go";
|
||||||
|
|
Loading…
Reference in New Issue