mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-15 04:57:51 +00:00
Fix darwin rebuild fails with flake and dry-run
This commit is contained in:
parent
ef56fd8979
commit
184f30c864
1 changed files with 8 additions and 2 deletions
|
@ -19,6 +19,7 @@ showSyntax() {
|
||||||
|
|
||||||
# Parse the command line.
|
# Parse the command line.
|
||||||
origArgs=("$@")
|
origArgs=("$@")
|
||||||
|
extraMetadataFlags=()
|
||||||
extraBuildFlags=()
|
extraBuildFlags=()
|
||||||
extraLockFlags=()
|
extraLockFlags=()
|
||||||
extraProfileFlags=()
|
extraProfileFlags=()
|
||||||
|
@ -35,7 +36,11 @@ while [ $# -gt 0 ]; do
|
||||||
edit|switch|activate|build|check|changelog)
|
edit|switch|activate|build|check|changelog)
|
||||||
action=$i
|
action=$i
|
||||||
;;
|
;;
|
||||||
--show-trace|--no-build-hook|--dry-run|--keep-going|-k|--keep-failed|-K|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|-Q)
|
--show-trace|--keep-going|--keep-failed|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback)
|
||||||
|
extraMetadataFlags+=("$i")
|
||||||
|
extraBuildFlags+=("$i")
|
||||||
|
;;
|
||||||
|
--no-build-hook|--dry-run|-k|-K|-Q)
|
||||||
extraBuildFlags+=("$i")
|
extraBuildFlags+=("$i")
|
||||||
;;
|
;;
|
||||||
-j[0-9]*)
|
-j[0-9]*)
|
||||||
|
@ -57,6 +62,7 @@ while [ $# -gt 0 ]; do
|
||||||
j=$1
|
j=$1
|
||||||
k=$2
|
k=$2
|
||||||
shift 2
|
shift 2
|
||||||
|
extraMetadataFlags+=("$i" "$j" "$k")
|
||||||
extraBuildFlags+=("$i" "$j" "$k")
|
extraBuildFlags+=("$i" "$j" "$k")
|
||||||
;;
|
;;
|
||||||
--flake)
|
--flake)
|
||||||
|
@ -132,7 +138,7 @@ if [ -n "$flake" ]; then
|
||||||
cmd=info
|
cmd=info
|
||||||
fi
|
fi
|
||||||
|
|
||||||
flake=$(nix "${flakeFlags[@]}" flake "$cmd" --json "${extraBuildFlags[@]}" "${extraLockFlags[@]}" -- "$flake" | jq -r .url)
|
flake=$(nix "${flakeFlags[@]}" flake "$cmd" --json "${extraMetadataFlags[@]}" "${extraLockFlags[@]}" -- "$flake" | jq -r .url)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$action" != build ] && [ -z "$flake" ]; then
|
if [ "$action" != build ] && [ -z "$flake" ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue