From 6325e7ff1406f7af435042429601dc29d74cbebe Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 26 Apr 2026 15:04:05 -0400 Subject: [PATCH] lib.extendDerivation: inline variables --- lib/customisation.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index ce00e364ba76..1a2815098420 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -409,12 +409,10 @@ rec { extendDerivation = condition: passthru: drv: let - outputs = drv.outputs or [ "out" ]; - commonAttrs = drv // (listToAttrs outputsList) // { all = map (x: x.value) outputsList; } // passthru; - outputToAttrListElement = outputName: { + outputsList = map (outputName: { name = outputName; value = commonAttrs @@ -436,9 +434,7 @@ rec { # TODO: also add overrideAttrs when overrideAttrs is not custom, e.g. when not splicing. overrideAttrs = f: (passthru.overrideAttrs f).${outputName}; }; - }; - - outputsList = map outputToAttrListElement outputs; + }) (drv.outputs or [ "out" ]); in commonAttrs // {