From 1678a7cb21dc1adcc4aaf2f2436ec7ab761a18e6 Mon Sep 17 00:00:00 2001
From: John Ott <john@johnott.us>
Date: Fri, 19 Dec 2025 19:40:15 -0800
Subject: [PATCH] docker_25: add version-specific system plugin dir patch for
 CLI v25

---
 .../cli-system-plugin-dir-from-env-25.patch   | 22 +++++++++++++++++++
 .../virtualization/docker/default.nix         |  7 +++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch

diff --git a/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch
new file mode 100644
index 000000000000..616b501d2ff8
--- /dev/null
+++ b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch
@@ -0,0 +1,22 @@
+diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go
+index 000c058df0..246c427cba 100644
+--- a/cli-plugins/manager/manager_unix.go
++++ b/cli-plugins/manager/manager_unix.go
+@@ -2,7 +2,13 @@
+ 
+ package manager
+ 
+-var defaultSystemPluginDirs = []string{
+-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
++import (
++    "os"
++    "path/filepath"
++)
++
++var defaultSystemPluginDirs []string
++
++func init() {
++    defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS"))
+ }
+ 
\ No newline at end of file
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c676e421804c..d23949579ac2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -277,7 +277,12 @@ let
         };
 
         patches = [
-          ./cli-system-plugin-dir-from-env.patch
+          (
+            if lib.versionOlder version "26.0.0" then
+              ./cli-system-plugin-dir-from-env-25.patch
+            else
+              ./cli-system-plugin-dir-from-env.patch
+          )
         ];
 
         vendorHash = null;