diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-08 22:26:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 22:26:28 +0200 |
| commit | 06ef2ec02939ef5131b7756f4a6b8f216a103da3 (patch) | |
| tree | 83467d6851c38f91e7f486867e3ecea47880d64b /pkgs/tools/misc | |
| parent | ab4a04c38b3ffd5a2e48bf849125128f560c689d (diff) | |
| parent | b917daaf60fbc27f03822ee5e79eae5b34b806fd (diff) | |
| download | nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar.gz nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar.bz2 nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar.lz nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar.xz nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.tar.zst nixlib-06ef2ec02939ef5131b7756f4a6b8f216a103da3.zip | |
Merge pull request #40136 from sh4r3m4n/fzf-fix
fzf: fix vim plugin patch phase
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 1eb4393c978b..d9da04c1fa1b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -23,8 +23,13 @@ buildGoPackage rec { goDeps = ./deps.nix; patchPhase = '' - sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim - 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'|" plugin/fzf.vim + + # Original and output files can't be the same + if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then + echo "Vim plugin patch not applied properly. Aborting" && \ + exit 1 + fi ''; preInstall = '' |