Unverified Commit e73b5853 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

tini: add patch for cmake minimum version (#451640)

parents e0e68c54 12828f1f

pkgs/applications/virtualization/docker/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ let 
          hash = tiniHash;

        };



        patches = [ ];



        # Do not remove static from make files as we want a static binary

        postPatch = "";

pkgs/by-name/ti/tini/package.nix

+13 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  fetchpatch,

}:



stdenv.mkDerivation rec {
@@ -16,6 +17,18 @@ stdenv.mkDerivation rec { 
    sha256 = "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4";

  };



  # Note: These patches can be removed with the next release

  patches = [

    (fetchpatch {

      url = "https://github.com/krallin/tini/commit/0b44d3665869e46ccbac7414241b8256d6234dc4.patch";

      hash = "sha256-gjM8MaPVx65f7KIry2XVYnVyjoBCQZAp2cQ8m7eW24c=";

    })

    (fetchpatch {

      url = "https://github.com/krallin/tini/commit/071c715e376e9ee0ac1a196fe8c38bcb61ad385c.patch";

      hash = "sha256-idnYcVuhCXQuhFSqcrNjbCLhR4HNlv8QonrtBqEbo3A=";

    })

  ];



  postPatch = "sed -i /tini-static/d CMakeLists.txt";



  env.NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37";