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

vimPlugins: FIX fzf outside goPackages

Browse Source
This commit is contained in:
Kamil Chmielewski 2016-06-04 08:14:36 +02:00
parent 20a457faf7
commit 6909d0e456
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/vim-plugins/default.nix
View File

@ -1,7 +1,7 @@
# TODO check that no license information gets lost
{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, goPackages
, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, fzf
, Cocoa ? null
}:
@ -98,9 +98,9 @@ rec {
wombat256 = wombat256-vim; # backwards compat, added 2015-7-8
yankring = YankRing;
fzf = buildVimPluginFrom2Nix {
name = goPackages.fzf.name;
src = "${goPackages.fzf}/share/go/src/github.com/junegunn/fzf";
fzfWrapper = buildVimPluginFrom2Nix {
name = fzf.name;
src = "${fzf}/share/go/src/github.com/junegunn/fzf";
dependencies = [];
};

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

@ -28,6 +28,6 @@ buildGoPackage rec {
postInstall= ''
cp $src/bin/fzf-tmux $bin/bin
mkdir -p $out/share/vim-plugins
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name}
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
'';
}

2
pkgs/top-level/all-packages.nix
View File

@ -801,7 +801,7 @@ in
fsmark = callPackage ../tools/misc/fsmark { };
fzf = (callPackage ../tools/misc/fzf {}).bin;
fzf = callPackage ../tools/misc/fzf { };
fzy = callPackage ../tools/misc/fzy { };