From f4d29d01cd6aed48f96adb603a3b0ca749b97fe7 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 25 Jul 2025 15:17:52 -0700
Subject: [PATCH] optee-os: ensure multi-output setup hook does not misplace
 TA_DEV_KIT_DIR

---
 pkgs/misc/optee-os/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/misc/optee-os/default.nix b/pkgs/misc/optee-os/default.nix
index e191a254a023..2b3235e7445c 100644
--- a/pkgs/misc/optee-os/default.nix
+++ b/pkgs/misc/optee-os/default.nix
@@ -94,6 +94,15 @@ let
           runHook postInstall
         '';
 
+        # The conventional build system for OPTEE trusted applications accepts
+        # a TA_DEV_KIT_DIR parameter, which expects all artifacts (headers and
+        # libraries) to exist in that directory. We populate a "devkit" Nix
+        # output for this purpose, but we must also tell the multiple-output
+        # setup hook to not move our artifacts after we populate this
+        # directory.
+        outputDev = "devkit";
+        outputLib = "devkit";
+
         meta =
 
           {