From 8b6ba02f4578814065c165f90247d69b3192d274 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Sun, 27 Mar 2022 14:48:14 +0200
Subject: [PATCH] [Overlays/Optimizations] Fix cmakeFlags

---
 overlays.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/overlays.nix b/overlays.nix
index f395ec9..3120804 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -14,16 +14,21 @@ let
       cxxflags = [ (attrs.CXXFLAGS or "") ] ++ config.aviallon.programs.compileFlags;
       rustflags = [ (attrs.RUSTFLAGS or "") "-C target-cpu=${config.aviallon.general.cpuArch}" ];
       pkgname = getName pkg;
-      cmakeflags = [ (attrs.cmakeFlags or "") ] ++ [ "-DCMAKE_CXX_FLAGS=\"${toString cxxflags}\"" ];
+      cmakeflags = mytrace "cmakeflags" "-DCMAKE_CXX_FLAGS=${toString cxxflags}";
+      configureflags = [ (attrs.configureFlags or "") ] ++ [
+        "--enable-lto" "--enable-offload-targets=nvptx-none" "--disable-libunwind-exceptions"
+      ];
       mytrace = name: value: builtins.trace "${pkgname}: ${name}: ${toString value}" (toString value);
      in {
       NIX_CFLAGS_COMPILE = mytrace "CFLAGS" cflags;
       CXXFLAGS = mytrace "CXXFLAGS" cxxflags;
       RUSTFLAGS = mytrace "RUSTFLAGS" rustflags;
-      configureFlags = mytrace "configureFlags" ([ (attrs.configureFlags or "") ] ++ [
-        "--enable-lto" "--enable-offload-targets=nvptx-none" "--disable-libunwind-exceptions"
-      ]);
-      cmakeFlags = mytrace "cmakeFlags" cmakeflags;
+      configureFlags = mytrace "configureFlags" configureflags;
+      preConfigure = ''
+        cmakeFlagsArray+=(
+          "${cmakeflags}"
+        )
+      '';
       doCheck = false;
     });
    optimizeForThisHost = if (cfg.optimizations) then (pkg: _optimizeForThisHost pkg) else (pkg: pkg);