diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
| commit | 8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25 (patch) | |
| tree | f6498b73e5b1201d1af141b53913d996d5f187a9 /pkgs/tools/misc | |
| parent | 3a4eda2e38fd80e6c9bd36606e9da16a47e41922 (diff) | |
| parent | 640c9779968bb98a047aa2d59770a7d3daa35871 (diff) | |
| download | nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.gz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.bz2 nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.lz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.xz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.zst nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/exa/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 7 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index c07420821ed4..2e6753cec347 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -23,6 +23,20 @@ buildRustPackage rec { 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 + + 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 + ''; + # Some tests fail, but Travis ensures a proper build doCheck = false; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b7e3116b672e..f76b439b9206 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -38,11 +38,16 @@ buildPythonApplication rec { ++ optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; + postInstall = '' + mkdir -p $out/share/zsh/site-functions + cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl + ''; + # Requires network doCheck = false; meta = { - homepage = http://rg3.github.io/youtube-dl/; + homepage = https://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; longDescription = '' |