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 {}; $*" -} - -evalAttrs() { - evalNix "builtins.concatStringsSep \"\\n\" (builtins.attrNames $*)" + nix-instantiate --eval --strict "${extraEvalFlags[@]}" -E "with import {}; $*" 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]