From 4d2bcaed5ceabb09a82dc18edae127d3c8bd1d18 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 10 May 2020 11:24:03 +1000 Subject: [PATCH] containerd: use installShellFiles --- .../virtualization/containerd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 86f4a7f099f5..4210994f4352 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }: with lib; @@ -18,7 +18,7 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man utillinux ]; + nativeBuildInputs = [ go-md2man installShellFiles utillinux ]; buildInputs = [ btrfs-progs ]; @@ -39,14 +39,7 @@ buildGoPackage rec { done make man - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manFile in man/*; do - manName="$(basename "$manFile")" # "docker-build.1" - number="$(echo $manName | rev | cut -d'.' -f1 | rev)" - mkdir -p "$manRoot/man$number" - gzip -c "$manFile" > "$manRoot/man$number/$manName.gz" - done + installManPage man/*.[1-9] ''; meta = {