From af4f868a216ea94a0b5cecab302551a746979c17 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Mon, 13 Oct 2025 13:03:02 +0200
Subject: [PATCH 1/2] tini: add patch for cmake minimum version

---
 pkgs/by-name/ti/tini/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/ti/tini/package.nix b/pkgs/by-name/ti/tini/package.nix
index 0779a1ac627c..8ec27ff2b298 100644
--- a/pkgs/by-name/ti/tini/package.nix
+++ b/pkgs/by-name/ti/tini/package.nix
@@ -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";

From 12828f1fa027d9b09bbec49b3a553263514c9aed Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Mon, 13 Oct 2025 14:58:33 +0200
Subject: [PATCH 2/2] docker-tini: unset patches of original tini package

---
 pkgs/applications/virtualization/docker/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 26754231051b..1a6924d470d4 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -123,6 +123,8 @@ let
           hash = tiniHash;
         };
 
+        patches = [ ];
+
         # Do not remove static from make files as we want a static binary
         postPatch = "";