Merge master into staging-next

2021-03-12 00:39:51 +00:00
parent d6257d451b 0fad702a50
commit 903fc48674
27 changed files with 162 additions and 96 deletions
@@ -91,9 +91,11 @@ self: super: {
  # plugin, since part of the fzf vim plugin is included in the main fzf
  # program.
  fzfWrapper = buildVimPluginFrom2Nix {
+    inherit (fzf) src version;
    pname = "fzf";
-    version = fzf.version;
-    src = fzf.src;
+    postInstall = ''
+      ln -s ${fzf}/bin/fzf $target/bin/fzf
+    '';
  };

  skim = buildVimPluginFrom2Nix {