diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-09-09 11:24:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 11:24:45 +0200 |
| commit | 9fd9768c742ac863a8442c9fb7c9f0b5423e2601 (patch) | |
| tree | a1b72e6c2ace7da4916e3676df4d5a2f598822eb /pkgs/tools | |
| parent | 787eabd7c122ffbf1343499aa8e9c4cb7a68a519 (diff) | |
| parent | a8c3fb990f4ec4e37780632e7d0dbf33e0ba8860 (diff) | |
| download | nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar.gz nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar.bz2 nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar.lz nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar.xz nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.tar.zst nixlib-9fd9768c742ac863a8442c9fb7c9f0b5423e2601.zip | |
Merge pull request #68329 from lilyball/exa-installShellFiles
exa: adopt installShellFiles
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/exa/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d94f1c1929ff..e05963b69027 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib -, darwin, libiconv +, darwin, libiconv, installShellFiles }: with rustPlatform; @@ -17,24 +17,20 @@ buildRustPackage rec { sha256 = "14qlm9zb9v22hxbbi833xaq2b7qsxnmh15s317200vz5f1305hhw"; }; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; buildInputs = [ zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] ; - postInstall = '' - mkdir -p $out/share/man/man1 - cp contrib/man/exa.1 $out/share/man/man1/ - - mkdir -p $out/share/bash-completion/completions - cp contrib/completions.bash $out/share/bash-completion/completions/exa + outputs = [ "out" "man" ]; - mkdir -p $out/share/fish/vendor_completions.d - cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish - - mkdir -p $out/share/zsh/site-functions - cp contrib/completions.zsh $out/share/zsh/site-functions/_exa + postInstall = '' + installManPage contrib/man/exa.1 + installShellCompletion \ + --name exa contrib/completions.bash \ + --name exa.fish contrib/completions.fish \ + --name _exa contrib/completions.zsh ''; # Some tests fail, but Travis ensures a proper build |