From fb8fdc33e87f8a1fdcc354ba35775c3f606bfff4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 30 Jun 2023 19:37:17 +0300 Subject: [PATCH] makeSetupHook: unbreak structuredAttrsByDefault --- pkgs/build-support/trivial-builders/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 2af36008c7a5..871f9722a4a2 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -624,6 +624,10 @@ rec { script: runCommand name (substitutions // { + # TODO(@Artturin:) substitutions should be inside the env attrset + # but users are likely passing non-substitution arguments through substitutions + # turn off __structuredAttrs to unbreak substituteAll + __structuredAttrs = false; inherit meta; inherit depsTargetTargetPropagated; propagatedBuildInputs =