diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-10 17:58:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-10 17:58:45 +0000 |
commit | 894db25ee2b77281aa6fc27939d06d769627f37b (patch) | |
tree | 897aced8023f1d228d7fac4170d0b5852db214c9 /pkgs/applications | |
parent | 43e4dd4d4dfc6203e1ade069d480497f2ca67f98 (diff) | |
parent | 849dd43891def025854d3f51ac4f76014455eeaa (diff) | |
download | nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar.gz nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar.bz2 nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar.lz nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar.xz nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.tar.zst nixlib-894db25ee2b77281aa6fc27939d06d769627f37b.zip |
Merge pull request #31491 from adisbladis/tini-0_16_1
tini: 0.13.1 -> 0.16.1
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/virtualization/tini/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 2a7b4810a24f..0d4aa4783c6b 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,20 +1,25 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.13.1"; + version = "0.16.1"; name = "tini-${version}"; + src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6"; + sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp"; }; + patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; + buildInputs = [ cmake glibc glibc.static ]; + meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; |