From c33811716d42e163f76f6d2b5cbe0c1c5777e40a Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Mon, 27 Apr 2026 11:06:55 -0400
Subject: [PATCH] lib.makeOverridable: avoid optionalAttrs merge

---
 lib/customisation.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index fdaf80c9b6b8..f20298cb8808 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -168,8 +168,8 @@ rec {
             f
             // fDecorated
             # Decorate f.override if presented
-            // lib.optionalAttrs (f ? override) {
-              override = fdrv: makeOverridable (f.override fdrv);
+            // {
+              ${if f ? override then "override" else null} = fdrv: makeOverridable (f.override fdrv);
             }
           )
             (mirrorArgs f')