From b6ae3c1a3b927c571a195e940331d4c353d15c32 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 14 Apr 2026 13:39:42 +0300
Subject: [PATCH] buildEnv: add support for __structuredAttrs & strictDeps

Enable adding new packages to nixpkgs that are defined using buildEnv,
without triggering new nixpkgs-vet CI failures. See:

https://github.com/NixOS/nixpkgs-vet/pull/203

In the future, enable `__structuredAttrs` and `strictDeps` by default.
---
 pkgs/build-support/buildenv/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index e694a9b838e17..58d9c10af7786 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -64,6 +64,10 @@ lib.makeOverridable (
 
     passthru ? { },
     meta ? { },
+
+    __structuredAttrs ? false,
+    # TODO(@Artturin): enable strictDeps always
+    strictDeps ? false,
   }:
   let
     chosenOutputs = map (drv: {
@@ -106,6 +110,8 @@ lib.makeOverridable (
           postBuild
           nativeBuildInputs
           buildInputs
+          __structuredAttrs
+          strictDeps
           ;
         pathsToLinkJSON = builtins.toJSON pathsToLink;
         pkgs = builtins.toJSON chosenOutputs;