From 7723d9935f6a134ce8cc878eb566c6caa784318e Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Fri, 28 Jul 2017 12:42:28 +0300 Subject: [PATCH] fzf: add script for finding 'share' folder So that helper scripts can be easily sourced in interactive shell configuration. `autojump` package was already present and had the same requirements for findind a `share` folders, so I took an inspiration there. I beleive this is a better alternative to: - https://github.com/NixOS/nixpkgs/pull/25080 - https://github.com/NixOS/nixpkgs/pull/27058 Replacing `$out/share/shell` with `$bin/share/fzf` was necessary to prevent dependency loop in produced derivations. --- doc/package-notes.xml | 30 ++++++++++++++++++++++++------ pkgs/tools/misc/fzf/default.nix | 10 +++++++++- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 33a61f31938c..230f0ec7b93f 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -366,15 +366,33 @@ it. Place the resulting package.nix file into -
+
-Autojump +Interactive shell helpers - autojump needs the shell integration to be useful but unlike other systems, - nix doesn't have a standard share directory location. This is why a - autojump-share script is shipped that prints the location - of the shared folder. This can then be used in the .bashrc like this: + Some packages provide the shell integration to be more useful. But + unlike other systems, nix doesn't have a standard share directory + location. This is why a bunch PACKAGE-share + scripts are shipped that print the location of the corresponding + shared folder. + + Current list of such packages is as following: + + + + + autojump: autojump-share + + + + + fzf: fzf-share + + + + + E.g. autojump can then used in the .bashrc like this: source "$(autojump-share)/autojump.bash" diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 916ba99317e8..11bc0ef4d111 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -39,7 +39,15 @@ buildGoPackage rec { cp -r $src/man/man1 $man/share/man mkdir -p $out/share/vim-plugins ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} - cp -R $src/shell $out/share/shell + + cp -R $src/shell $bin/share/fzf + cat <