From 18e7551efc7beca866fd2cfa3092d9386eb1dd34 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 03:34:41 +0300
Subject: [PATCH] buildenv: replace // optionalAttrs with nullable attr names

Convert 2 optionalAttrs (args ? nativeBuildInputs, args ? buildInputs) in the compatArgs block into nullable attribute names in a single attrset.
---
 pkgs/build-support/buildenv/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 13ab910ab6b8..797126aa7644 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -86,13 +86,10 @@ lib.makeOverridable (
         buildInputs ? null,
       }@args:
       let
-        compatArgs =
-          lib.optionalAttrs (args ? nativeBuildInputs) {
-            inherit nativeBuildInputs;
-          }
-          // lib.optionalAttrs (args ? buildInputs) {
-            inherit buildInputs;
-          };
+        compatArgs = {
+          ${if args ? nativeBuildInputs then "nativeBuildInputs" else null} = nativeBuildInputs;
+          ${if args ? buildInputs then "buildInputs" else null} = buildInputs;
+        };
       in
       compatArgs
       // derivationArgs