diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
| commit | 33e1c78ae3681719b389d4ead425afa4433f445d (patch) | |
| tree | 015a86dbeb3b745e5daf876c184ccbd6b91f2db2 /pkgs/applications/virtualization | |
| parent | 1747d28e5ada05ec07c4b1d35048ea5b194bde64 (diff) | |
| parent | 888efed972d95e1f2bc31e4394ff841f0690d216 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/tini/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index fe016da6e58a0..535ca551785fa 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -7,14 +7,12 @@ stdenv.mkDerivation rec { url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz"; sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa"; }; + patchPhase = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; buildInputs = [ cmake ]; - postInstall = '' - rm $out/bin/tini-static - ''; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; |