From 6d934beacc2e491ba595f2852b3b7e982f69a2ba Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Thu, 2 May 2024 16:31:44 +0200
Subject: [PATCH] [Optimizations] fix long-before broken default value for
 "lto"

---
 optimizations/optimizations.nix | 38 ++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/optimizations/optimizations.nix b/optimizations/optimizations.nix
index bb01c1c..2c77eb1 100644
--- a/optimizations/optimizations.nix
+++ b/optimizations/optimizations.nix
@@ -7,26 +7,34 @@ let
 
   addAttrs = myLib.optimizations.addAttrs;
 
+  defaultOptimizeAttrs = {
+    level = "normal";
+    recursive = 0;
+    cpuCores = generalCfg.cpu.threads;
+    cpuArch = generalCfg.cpu.arch;
+    cpuTune = generalCfg.cpu.tune;
+    l1dCache = generalCfg.cpu.caches.l1d;
+    l1iCache = generalCfg.cpu.caches.l1i;
+    l1LineCache = generalCfg.cpu.caches.cacheLine;
+    lastLevelCache = generalCfg.cpu.caches.lastLevel;
+    extraCFlags = cfg.extraCompileFlags;
+    blacklist = cfg.blacklist;
+    ltoBlacklist = cfg.lto.blacklist;
+    overrideMap = cfg.overrideMap;
+    lto = cfg.lto.enable;
+  };
+
   optimizePkg = {
-      cpuCores ? generalCfg.cpu.threads,
-      cpuArch ? generalCfg.cpu.arch,
-      cpuTune ? generalCfg.cpu.tune,
-      l1dCache ? generalCfg.cpu.caches.l1d,
-      l1iCache ? generalCfg.cpu.caches.l1i,
-      l1LineCache ? generalCfg.cpu.caches.cacheLine,
-      lastLevelCache ? generalCfg.cpu.caches.lastLevel,
-      extraCFlags ? cfg.extraCompileFlags,
-      blacklist ? cfg.blacklist,
-      ltoBlacklist ? cfg.lto.blacklist,
-      overrideMap ? cfg.overrideMap,
-      lto ? cfg.lto,
       attributes ? {},
       stdenv ? null,
       ...
     }@attrs: pkg:
-      myLib.optimizations.optimizePkg pkg (cfg.defaultSettings // {
-        inherit cpuCores cpuTune cpuArch extraCFlags blacklist ltoBlacklist overrideMap stdenv attributes l1dCache l1iCache l1LineCache lastLevelCache;
-      } // attrs);
+      myLib.optimizations.optimizePkg pkg (
+        defaultOptimizeAttrs
+        // cfg.defaultSettings
+        // { inherit stdenv attributes; }
+        // attrs
+      );
 in {
   options.aviallon.optimizations = {
     enable = mkOption {