tini: don't explicitly depend on glibc
* Fixes pkgsStatic.tini build. * Use postPatch instead of patchPhase * Moves glibc dependency into docker.docker-tini
This commit is contained in:
parent
e14843556c
commit
9c40b6f375
|
@ -11,7 +11,7 @@ rec {
|
||||||
, tiniRev, tiniSha256, buildxSupport ? false
|
, tiniRev, tiniSha256, buildxSupport ? false
|
||||||
# package dependencies
|
# package dependencies
|
||||||
, stdenv, fetchFromGitHub, buildGoPackage
|
, stdenv, fetchFromGitHub, buildGoPackage
|
||||||
, makeWrapper, installShellFiles, pkg-config
|
, makeWrapper, installShellFiles, pkg-config, glibc
|
||||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||||
, sqlite, iproute2, lvm2, systemd, docker-buildx
|
, sqlite, iproute2, lvm2, systemd, docker-buildx
|
||||||
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
|
||||||
|
@ -56,7 +56,9 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
# Do not remove static from make files as we want a static binary
|
# Do not remove static from make files as we want a static binary
|
||||||
patchPhase = "";
|
postPatch = "";
|
||||||
|
|
||||||
|
buildInputs = [ glibc glibc.static ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
|
NIX_CFLAGS_COMPILE = "-DMINIMAL=ON";
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, glibc }:
|
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.19.0";
|
version = "0.19.0";
|
||||||
|
@ -11,12 +11,11 @@ stdenv.mkDerivation rec {
|
||||||
sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";
|
sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
|
postPatch = "sed -i /tini-static/d CMakeLists.txt";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";
|
NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ glibc glibc.static ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A tiny but valid init for containers";
|
description = "A tiny but valid init for containers";
|
||||||
|
|
Loading…
Reference in a new issue