From 0e886b69ab790c6c941c248faef50ba11da73134 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 19 Mar 2020 11:43:22 +1000 Subject: [PATCH] fd: use installShellFiles --- pkgs/tools/misc/fd/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 3136381dd8e..3dfe7c80a5a 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "fd"; @@ -13,18 +13,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5"; - preFixup = '' - install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1" + nativeBuildInputs = [ installShellFiles ]; - install -Dm644 target/release/build/fd-find-*/out/fd.bash \ - "$out/share/bash-completion/completions/fd.bash" - install -Dm644 target/release/build/fd-find-*/out/fd.fish \ - "$out/share/fish/vendor_completions.d/fd.fish" - install -Dm644 target/release/build/fd-find-*/out/_fd \ - "$out/share/zsh/site-functions/_fd" + preFixup = '' + installManPage "$src/doc/fd.1" + + (cd target/release/build/fd-find-*/out + installShellCompletion fd.{bash,fish} + installShellCompletion --zsh _fd) ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple, fast and user-friendly alternative to find"; longDescription = '' `fd` is a simple, fast and user-friendly alternative to `find`.