From cb37c35e33239b844203987fff18f91370939921 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Jun 2023 13:03:49 +0200
Subject: [PATCH] fix darwin-option descriptions

Also drops the eval hacks in favour of jq.
---
 modules/nix/nix-darwin.nix      |  2 +-
 pkgs/nix-tools/darwin-option.sh | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modules/nix/nix-darwin.nix b/modules/nix/nix-darwin.nix
index f86b1543..fceecc25 100644
--- a/modules/nix/nix-darwin.nix
+++ b/modules/nix/nix-darwin.nix
@@ -16,8 +16,8 @@ let
 
   darwin-option = writeProgram "darwin-option"
     {
-      inherit (config.system) profile;
       inherit (stdenv) shell;
+      path = "${extraPath}:${config.environment.systemPath}";
     }
     ../../pkgs/nix-tools/darwin-option.sh;
 
diff --git a/pkgs/nix-tools/darwin-option.sh b/pkgs/nix-tools/darwin-option.sh
index d6d466b2..8e40e93c 100755
--- a/pkgs/nix-tools/darwin-option.sh
+++ b/pkgs/nix-tools/darwin-option.sh
@@ -4,26 +4,24 @@ set -o pipefail
 export PATH=@path@:$PATH
 
 evalNix() {
-  nix-instantiate --eval --strict "${extraEvalFlags[@]}" -E "with import <darwin> {}; $*"
-}
-
-evalAttrs() {
-  evalNix "builtins.concatStringsSep \"\\n\" (builtins.attrNames $*)"
+  nix-instantiate --eval --strict "${extraEvalFlags[@]}" -E "with import <darwin> {}; $*" 2>/dev/null
 }
 
 evalOpt() {
-  evalNix "options.$option.$*" 2>/dev/null
+  evalNix "options.$option.$*"
+}
+
+evalOptAttrs() {
+  evalNix "builtins.concatStringsSep \"\\n\" (builtins.attrNames $*)" | jq -r .
 }
 
 evalOptText() {
-  eval printf "$(evalNix "options.$option.$*" 2>/dev/null)" 2>/dev/null
-  echo
+  evalNix "options.$option.$*" | jq -r .
 }
 
 showSyntax() {
   echo "$0: [-I path] <option>" >&2
-  eval printf "$(evalAttrs "options")"
-  echo
+  evalOptAttrs "options"
   exit 1
 }
 
@@ -69,9 +67,8 @@ if [ "$(evalOpt "_type")" = '"option"' ]; then
   fi
   echo
   echo "Description:"
-  evalOptText "description" || echo "no description"
+  evalOptText "description.text" || echo "no description"
   echo
 else
-  eval printf "$(evalAttrs "options.$option")" 2>/dev/null
-  echo
+  evalOptAttrs "options.$option"
 fi