mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-05 08:17:01 +00:00
fix darwin-option descriptions
Also drops the eval hacks in favour of jq.
This commit is contained in:
parent
53c6748f98
commit
cb37c35e33
2 changed files with 11 additions and 14 deletions
|
@ -16,8 +16,8 @@ let
|
||||||
|
|
||||||
darwin-option = writeProgram "darwin-option"
|
darwin-option = writeProgram "darwin-option"
|
||||||
{
|
{
|
||||||
inherit (config.system) profile;
|
|
||||||
inherit (stdenv) shell;
|
inherit (stdenv) shell;
|
||||||
|
path = "${extraPath}:${config.environment.systemPath}";
|
||||||
}
|
}
|
||||||
../../pkgs/nix-tools/darwin-option.sh;
|
../../pkgs/nix-tools/darwin-option.sh;
|
||||||
|
|
||||||
|
|
|
@ -4,26 +4,24 @@ set -o pipefail
|
||||||
export PATH=@path@:$PATH
|
export PATH=@path@:$PATH
|
||||||
|
|
||||||
evalNix() {
|
evalNix() {
|
||||||
nix-instantiate --eval --strict "${extraEvalFlags[@]}" -E "with import <darwin> {}; $*"
|
nix-instantiate --eval --strict "${extraEvalFlags[@]}" -E "with import <darwin> {}; $*" 2>/dev/null
|
||||||
}
|
|
||||||
|
|
||||||
evalAttrs() {
|
|
||||||
evalNix "builtins.concatStringsSep \"\\n\" (builtins.attrNames $*)"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
evalOpt() {
|
evalOpt() {
|
||||||
evalNix "options.$option.$*" 2>/dev/null
|
evalNix "options.$option.$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
evalOptAttrs() {
|
||||||
|
evalNix "builtins.concatStringsSep \"\\n\" (builtins.attrNames $*)" | jq -r .
|
||||||
}
|
}
|
||||||
|
|
||||||
evalOptText() {
|
evalOptText() {
|
||||||
eval printf "$(evalNix "options.$option.$*" 2>/dev/null)" 2>/dev/null
|
evalNix "options.$option.$*" | jq -r .
|
||||||
echo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
showSyntax() {
|
showSyntax() {
|
||||||
echo "$0: [-I path] <option>" >&2
|
echo "$0: [-I path] <option>" >&2
|
||||||
eval printf "$(evalAttrs "options")"
|
evalOptAttrs "options"
|
||||||
echo
|
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,9 +67,8 @@ if [ "$(evalOpt "_type")" = '"option"' ]; then
|
||||||
fi
|
fi
|
||||||
echo
|
echo
|
||||||
echo "Description:"
|
echo "Description:"
|
||||||
evalOptText "description" || echo "no description"
|
evalOptText "description.text" || echo "no description"
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
eval printf "$(evalAttrs "options.$option")" 2>/dev/null
|
evalOptAttrs "options.$option"
|
||||||
echo
|
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue