diff options
author | Graham Christensen <graham@grahamc.com> | 2016-08-14 18:25:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-14 18:25:04 -0400 |
commit | 226cba764fd6f9463995534ff9c0168ab0ae3b30 (patch) | |
tree | 2254f25d09d3622e7f2627b2a92287c544ec8e07 /pkgs | |
parent | 63f7b08afc09a4a8c134bc792a6a262905212157 (diff) | |
parent | 9a0dfe23d88131cbd0547cd40c7d295da54d78e1 (diff) | |
download | nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar.gz nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar.bz2 nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar.lz nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar.xz nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.tar.zst nixpkgs-226cba764fd6f9463995534ff9c0168ab0ae3b30.zip |
Merge pull request #17707 from womfoo/fix/tini-build
tini: fix build
Diffstat (limited to 'pkgs')
-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 fe016da6e58..535ca551785 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; |