diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix
index bde3ac811569..49ef1d8c57b9 100644
--- a/nixos/modules/services/system/self-deploy.nix
+++ b/nixos/modules/services/system/self-deploy.nix
@@ -179,10 +179,16 @@ in
         ${gitWithRepo} checkout FETCH_HEAD
 
         nix-build${renderNixArgs cfg.nixArgs} ${
-          lib.cli.toCommandLineShellGNU { } {
-            attr = cfg.nixAttribute;
-            out-link = outPath;
-          }
+          lib.cli.toCommandLineShell
+            (optionName: {
+              option = "--${optionName}";
+              sep = null;
+              explicitBool = false;
+            })
+            {
+              attr = cfg.nixAttribute;
+              out-link = outPath;
+            }
         } ${lib.escapeShellArg "${repositoryDirectory}${cfg.nixFile}"}
 
         ${lib.optionalString (