diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-04 08:14:36 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:21:30 +0200 |
| commit | 6909d0e45688b132600021f90f725e82ad144d98 (patch) | |
| tree | d1d81ba15046e310a51549f7f2d928a4660d1824 | |
| parent | 20a457faf777dee002024aa425a9076c936e0d3f (diff) | |
| download | nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar.gz nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar.bz2 nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar.lz nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar.xz nixlib-6909d0e45688b132600021f90f725e82ad144d98.tar.zst nixlib-6909d0e45688b132600021f90f725e82ad144d98.zip | |
vimPlugins: FIX fzf outside goPackages
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 800caad76e00..98a8a4ddf249 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -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 = []; }; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 08def70ecb6e..d1fd3ac0afce 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -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} ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89dc95eaeeb3..09842b4c232a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |