From a023145c7091b63894736bb5cfc7475c2fd8359c Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Date: Sun, 21 Jun 2026 16:16:02 -0400
Subject: [PATCH] lib.cli: use partially applied mkValueStringDefault

---
 lib/cli.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/cli.nix b/lib/cli.nix
index 9995a062fad9..6edc207c6dfa 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -14,6 +14,7 @@ let
     warnIf
     ;
   inherit (lib.generators) mkValueStringDefault;
+  mkValueString = mkValueStringDefault { };
 in
 rec {
   /**
@@ -148,10 +149,10 @@ rec {
             else if optionValueSeparator == null then
               [
                 (mkOptionName k)
-                (mkValueStringDefault { } v)
+                (mkValueString v)
               ]
             else
-              [ "${mkOptionName k}${optionValueSeparator}${mkValueStringDefault { } v}" ],
+              [ "${mkOptionName k}${optionValueSeparator}${mkValueString v}" ],
 
           optionValueSeparator ? null,
         }:
@@ -241,7 +242,7 @@ rec {
     {
       isLong ? optionName: stringLength optionName > 1,
       explicitBool ? false,
-      formatArg ? mkValueStringDefault { },
+      formatArg ? mkValueString,
     }:
     let
       optionFormat = optionName: {
@@ -450,7 +451,7 @@ rec {
           option,
           sep,
           explicitBool,
-          formatArg ? mkValueStringDefault { },
+          formatArg ? mkValueString,
         }:
         k: v:
         if v == null || (!explicitBool && v == false) then