From 9c40b6f375f0ab2220b4c3717671fa5ebc023044 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Fri, 11 Jun 2021 14:19:10 +1000 Subject: [PATCH] tini: don't explicitly depend on glibc * Fixes pkgsStatic.tini build. * Use postPatch instead of patchPhase * Moves glibc dependency into docker.docker-tini --- pkgs/applications/virtualization/docker/default.nix | 6 ++++-- pkgs/applications/virtualization/tini/default.nix | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bec51af81ac..ee7c4d6bcfa 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,7 +11,7 @@ rec { , tiniRev, tiniSha256, buildxSupport ? false # package dependencies , stdenv, fetchFromGitHub, buildGoPackage - , makeWrapper, installShellFiles, pkg-config + , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , 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 - patchPhase = ""; + postPatch = ""; + + buildInputs = [ glibc glibc.static ]; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index dd7bcb19978..76668301c6b 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { 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"; nativeBuildInputs = [ cmake ]; - buildInputs = [ glibc glibc.static ]; meta = with lib; { description = "A tiny but valid init for containers";