tini: don't explicitly depend on glibc

* Fixes pkgsStatic.tini build.
* Use postPatch instead of patchPhase
* Moves glibc dependency into docker.docker-tini

+6 -5
+4 -2
pkgs/applications/virtualization/docker/default.nix
··· 11 , tiniRev, tiniSha256, buildxSupport ? false 12 # package dependencies 13 , stdenv, fetchFromGitHub, buildGoPackage 14 - , makeWrapper, installShellFiles, pkg-config 15 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool 16 , sqlite, iproute2, lvm2, systemd, docker-buildx 17 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git ··· 56 }; 57 58 # Do not remove static from make files as we want a static binary 59 - patchPhase = ""; 60 61 NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; 62 });
··· 11 , tiniRev, tiniSha256, buildxSupport ? false 12 # package dependencies 13 , stdenv, fetchFromGitHub, buildGoPackage 14 + , makeWrapper, installShellFiles, pkg-config, glibc 15 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool 16 , sqlite, iproute2, lvm2, systemd, docker-buildx 17 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git ··· 56 }; 57 58 # Do not remove static from make files as we want a static binary 59 + postPatch = ""; 60 + 61 + buildInputs = [ glibc glibc.static ]; 62 63 NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; 64 });
+2 -3
pkgs/applications/virtualization/tini/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, glibc }: 2 3 stdenv.mkDerivation rec { 4 version = "0.19.0"; ··· 11 sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; 12 }; 13 14 - patchPhase = "sed -i /tini-static/d CMakeLists.txt"; 15 16 NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; 17 18 nativeBuildInputs = [ cmake ]; 19 - buildInputs = [ glibc glibc.static ]; 20 21 meta = with lib; { 22 description = "A tiny but valid init for containers";
··· 1 + { lib, stdenv, fetchFromGitHub, cmake }: 2 3 stdenv.mkDerivation rec { 4 version = "0.19.0"; ··· 11 sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; 12 }; 13 14 + postPatch = "sed -i /tini-static/d CMakeLists.txt"; 15 16 NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; 17 18 nativeBuildInputs = [ cmake ]; 19 20 meta = with lib; { 21 description = "A tiny but valid init for containers";