diff --git a/pkgs/by-name/op/openocd-adi/package.nix b/pkgs/by-name/op/openocd-adi/package.nix
new file mode 100644
index 000000000000..018d9552e39c
--- /dev/null
+++ b/pkgs/by-name/op/openocd-adi/package.nix
@@ -0,0 +1,30 @@
+{
+  openocd,
+  autoreconfHook,
+  lib,
+  fetchFromGitHub,
+}:
+
+openocd.overrideAttrs (old: {
+  pname = "openocd-adi";
+  version = "0.12.0-1.3.1-1";
+  src = fetchFromGitHub {
+    owner = "analogdevicesinc";
+    repo = "openocd";
+    tag = "0.12.0-1.3.1-1";
+    hash = "sha256-e25mAxUmbF/hZC+aWRMt9HdwKY0FClNrZXwP3888Z9A=";
+    # openocd disables the vendored libraries that use submodules and replaces them with nix versions.
+    # this works out as one of the submodule sources seems to be flakey.
+    fetchSubmodules = false;
+  };
+  nativeBuildInputs = old.nativeBuildInputs ++ [
+    autoreconfHook
+  ];
+  meta = openocd.meta // {
+    description = "ADI fork of OpenOCD";
+    homepage = "https://github.com/analogdevicesinc/openocd";
+    maintainers = with lib.maintainers; [
+      aiyion
+    ];
+  };
+})
diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix
index 037a233c1e85..e8fdd29854b7 100644
--- a/pkgs/by-name/op/openocd/package.nix
+++ b/pkgs/by-name/op/openocd/package.nix
@@ -82,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s "$rules" "$out/etc/udev/rules.d/"
   '';
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   meta = {
     description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing";
     mainProgram = "openocd";