diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-05-10 11:24:03 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-05-10 11:33:04 +1000 |
| commit | 764dd5c875fa225b554e613aaca7fb93c1920a0d (patch) | |
| tree | 571fb3e4375d730c7bc591a1ea01e38bf80846fb /pkgs/applications/virtualization | |
| parent | 4d2bcaed5ceabb09a82dc18edae127d3c8bd1d18 (diff) | |
| download | nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar.gz nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar.bz2 nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar.lz nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar.xz nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.tar.zst nixlib-764dd5c875fa225b554e613aaca7fb93c1920a0d.zip | |
docker: use installShellFiles
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f1b3475d9bca..f7c49526fb1f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -78,7 +78,7 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ installShellFiles pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ @@ -147,9 +147,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) - install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + installShellCompletion --bash ./components/cli/contrib/completion/bash/docker + installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish + installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) # Generate man pages from cobra commands @@ -163,16 +163,7 @@ rec { echo "Generate legacy manpages" ./man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in ./man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + installManPage man/*/*.[1-9] ''; preFixup = '' |