MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tini: don't explicitly depend on glibc

Browse source 
* Fixes pkgsStatic.tini build.
* Use postPatch instead of patchPhase
* Moves glibc dependency into docker.docker-tini
This commit is contained in:
Zane van Iperen 2021-06-11 14:19:10 +10:00
parent e14843556c
commit 9c40b6f375
No known key found for this signature in database
GPG key ID: 68616B2D8AC4DCC5
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/virtualization/docker/default.nix
View file

@ -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";
});

5
pkgs/applications/virtualization/tini/default.nix
View file

@ -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";