From 77c4074f451ff4e2f027be28c7725be44f9512bc Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 23 Sep 2025 09:14:14 -0700
Subject: [PATCH 1/3] docker-tini: s/init/tini/ in pname

docker-tini's pname was docker-init which was confusing since
there's a top level docker-init package, and the attr here is
docker-tini
---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 85c5d60af109..2676c2419224 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -113,7 +113,7 @@ let
       });
 
       docker-tini = tini.overrideAttrs {
-        pname = "docker-init";
+        pname = "docker-tini";
         inherit version;
 
         src = fetchFromGitHub {

From ace81c5492ff7574188f3d58610cd080afb43235 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 23 Sep 2025 09:17:29 -0700
Subject: [PATCH 2/3] docker-tini: bump for CMake 4 compat

diff: https://github.com/krallin/tini/compare/v0.19.0...369448a167e8b3da4ca5bca0b3307500c3371828

Changes since last tag are small and CMake 4 commit doesn't
backport cleanly so let's bump.
---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2676c2419224..26754231051b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -119,7 +119,7 @@ let
         src = fetchFromGitHub {
           owner = "krallin";
           repo = "tini";
-          tag = tiniRev;
+          rev = tiniRev;
           hash = tiniHash;
         };
 
@@ -401,8 +401,8 @@ in
       runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
       containerdRev = "v1.7.27";
       containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";
-      tiniRev = "v0.19.0";
-      tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
+      tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };
 
   docker_28 =
@@ -419,8 +419,8 @@ in
       runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY=";
       containerdRev = "v1.7.28";
       containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s=";
-      tiniRev = "v0.19.0";
-      tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
+      tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };
 
 }

From 3a3d97eba636d490644dcac645e5adda5f0ddff0 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 23 Sep 2025 09:22:32 -0700
Subject: [PATCH 3/3] openhmd: fix CMake 4 build

openhmd is unmaintained so substituting for CMake 4 compat

See #445575 to decide if something should be done about OpenHMD being
unmaintained
---
 pkgs/by-name/op/openhmd/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/op/openhmd/package.nix b/pkgs/by-name/op/openhmd/package.nix
index 01fc1d072edf..6795d1aa8563 100644
--- a/pkgs/by-name/op/openhmd/package.nix
+++ b/pkgs/by-name/op/openhmd/package.nix
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
     sha256 = "1hkpdl4zgycag5k8njvqpx01apxmm8m8pvhlsxgxpqiqy9a38ccg";
   };
 
+  # substitute for CMake 4 compat
+  # "OpenHMD is currently NOT ACTIVELY MAINTAINED" in upstream README
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config