From 295ac24361d86abe2ed013f873ef7432a7da458f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 30 Mar 2025 18:49:47 -0400
Subject: [PATCH] Verify all the optimized builds.

---
 nix/steam_deck/configuration/roles/ares/default.nix       | 1 -
 nix/steam_deck/configuration/roles/dolphin/default.nix    | 1 -
 nix/steam_deck/configuration/roles/pcsx2/default.nix      | 2 +-
 nix/steam_deck/configuration/roles/shipwright/default.nix | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/nix/steam_deck/configuration/roles/ares/default.nix b/nix/steam_deck/configuration/roles/ares/default.nix
index 4486c31..47b5375 100644
--- a/nix/steam_deck/configuration/roles/ares/default.nix
+++ b/nix/steam_deck/configuration/roles/ares/default.nix
@@ -55,7 +55,6 @@ in
               original_package =
                 if config.me.optimizations.enable then
                   (optimizeWithFlags prev.ares [
-                    # Verified working with ps
                     "-march=znver2"
                     "-mtune=znver2"
                   ])
diff --git a/nix/steam_deck/configuration/roles/dolphin/default.nix b/nix/steam_deck/configuration/roles/dolphin/default.nix
index 083b051..485a157 100644
--- a/nix/steam_deck/configuration/roles/dolphin/default.nix
+++ b/nix/steam_deck/configuration/roles/dolphin/default.nix
@@ -72,7 +72,6 @@ in
               original_package =
                 if config.me.optimizations.enable then
                   (optimizeWithFlags prev.dolphin-emu [
-                    # Verified working with ps
                     "-march=znver2"
                     "-mtune=znver2"
                   ])
diff --git a/nix/steam_deck/configuration/roles/pcsx2/default.nix b/nix/steam_deck/configuration/roles/pcsx2/default.nix
index c95f70b..8b72e51 100644
--- a/nix/steam_deck/configuration/roles/pcsx2/default.nix
+++ b/nix/steam_deck/configuration/roles/pcsx2/default.nix
@@ -51,7 +51,7 @@ in
               optimizeWithFlags =
                 pkg: flags:
                 pkg.overrideAttrs (old: {
-                  NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags;
+                  env.CXXFLAGS = (old.env.CXXFLAGS or "") + (lib.strings.concatStringsSep " " flags);
                 });
               original_package =
                 if config.me.optimizations.enable then
diff --git a/nix/steam_deck/configuration/roles/shipwright/default.nix b/nix/steam_deck/configuration/roles/shipwright/default.nix
index 33df6db..635b91a 100644
--- a/nix/steam_deck/configuration/roles/shipwright/default.nix
+++ b/nix/steam_deck/configuration/roles/shipwright/default.nix
@@ -58,7 +58,6 @@ in
               original_package =
                 if config.me.optimizations.enable then
                   (optimizeWithFlags prev.shipwright [
-                    # Verified working with ps
                     "-march=znver2"
                     "-mtune=znver2"
                   ])