From ad8310a2a1d9699bdb8901fcab8d1e5f3c5c3183 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Tue, 16 Apr 2024 19:20:06 +0200 Subject: [PATCH] [Lib/Optimizations] set attributes default value to be null instead of empty set Better overrides. --- lib/optimizations.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/optimizations.nix b/lib/optimizations.nix index 4d015db..a599a84 100644 --- a/lib/optimizations.nix +++ b/lib/optimizations.nix @@ -217,7 +217,7 @@ rec { , overrideMap ? { } , stdenv ? null , lto ? false - , attributes ? { } + , attributes ? null , _depth ? 0 , ... }@attrs: @@ -293,7 +293,12 @@ rec { } ); _pkgOptimized = addAttrs _pkg optimizedAttrs; - _pkgFinal = addAttrs _pkgOptimized attributes; + _pkgFinal = + if isAttrs attributes then + addAttrs _pkgOptimized (traceVal attributes) + else + _pkgOptimized + ; in trace "Optimized ${myGetName pkg} with overrideAttrs at level '${level}' (depth: ${toString _depth}, lto: ${if lto then "true" else "false"})" _pkgFinal else if (hasAttr "name" pkg) then