containerd: migrate to using buildGoPackage

… and add man pages, which means `containerd` becomes a multi-output
derivation : `containerd.bin` and `containerd.man`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-12-20 14:25:24 +01:00
parent 25eb8419d9
commit 17ddcccb56
No known key found for this signature in database
GPG Key ID: 083CC6FD6EB699A3
2 changed files with 22 additions and 22 deletions

View File

@ -1,9 +1,8 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo
, go, btrfs-progs }:
{ stdenv, lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
with lib;
stdenv.mkDerivation rec {
buildGoPackage rec {
name = "containerd-${version}";
version = "1.2.1";
@ -14,34 +13,37 @@ stdenv.mkDerivation rec {
sha256 = "16zn6p1ky3yrgn53z8h9wza53ch91fj47wj5xgz6w4c57j30f66p";
};
goPackagePath = "github.com/containerd/containerd";
outputs = [ "bin" "out" "man" ];
hardeningDisable = [ "fortify" ];
buildInputs = [ removeReferencesTo go btrfs-progs ];
buildInputs = [ btrfs-progs go-md2man utillinux ];
buildFlags = "VERSION=v${version}";
BUILDTAGS = []
++ optional (btrfs-progs == null) "no_btrfs";
preConfigure = ''
# Extract the source
cd "$NIX_BUILD_TOP"
mkdir -p "go/src/github.com/containerd"
mv "$sourceRoot" "go/src/github.com/containerd/containerd"
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
'';
preBuild = ''
cd go/src/github.com/containerd/containerd
buildPhase = ''
cd go/src/${goPackagePath}
patchShebangs .
make binaries
'';
installPhase = ''
mkdir -p $out/bin
cp bin/* $out/bin
'';
for b in bin/*; do
install -Dm555 $b $bin/$b
done
preFixup = ''
find $out -type f -exec remove-references-to -t ${go} '{}' +
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
'';
meta = {

View File

@ -28,7 +28,7 @@ rec {
patches = [];
});
docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
docker-containerd = containerd.overrideAttrs (oldAttrs: rec {
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
@ -39,8 +39,6 @@ rec {
};
hardeningDisable = [ "fortify" ];
buildInputs = [ removeReferencesTo go btrfs-progs ];
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {