From 70225566221179720a110bcbd66267dd8f4ec536 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Nov 2022 06:54:41 +0200 Subject: lib.overrideDerivation: override attrs in __spliced --- lib/customisation.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/customisation.nix') diff --git a/lib/customisation.nix b/lib/customisation.nix index cc9a9b1c55d0a..de424b0d722b8 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -38,12 +38,14 @@ rec { // (drv.passthru or {}) // - (if (drv ? crossDrv && drv ? nativeDrv) - then { - crossDrv = overrideDerivation drv.crossDrv f; - nativeDrv = overrideDerivation drv.nativeDrv f; - } - else { })); + (lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) { + crossDrv = overrideDerivation drv.crossDrv f; + nativeDrv = overrideDerivation drv.nativeDrv f; + }) + // + lib.optionalAttrs (drv ? __spliced) { + __spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced); + }); /* `makeOverridable` takes a function from attribute set to attribute set and -- cgit 1.4.1