diff options
| author | saccarosium <github.e41mv@aleeas.com> | 2022-12-08 09:48:45 +0100 |
|---|---|---|
| committer | saccarosium <github.e41mv@aleeas.com> | 2022-12-08 09:48:45 +0100 |
| commit | da843c0dde3462c96f13c69590cf47b87f91df95 (patch) | |
| tree | 30d8af5ec5eeecc17775193ed14cdece7327be96 /pkgs | |
| parent | 6349b99bc2b96ded34d068a88c7c5ced406b7f7f (diff) | |
darwin-rebuild: use `--no-link` for flake builds
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/nix-tools/darwin-rebuild.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index a57fad7..bb1c023 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -142,7 +142,11 @@ if [ -n "$flake" ]; then fi if [ "$action" != build ] && [ -z "$flake" ]; then - extraBuildFlags+=("--no-out-link") + if [ -n "$flake" ]; then + extraBuildFlags+=("--no-link") + else + extraBuildFlags+=("--no-out-link") + fi fi if [ "$action" = edit ]; then @@ -159,8 +163,10 @@ if [ "$action" = switch ] || [ "$action" = build ] || [ "$action" = check ]; the if [ -z "$flake" ]; then systemConfig="$(nix-build '<darwin>' "${extraBuildFlags[@]}" -A system)" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.system" "${extraBuildFlags[@]}" "${extraLockFlags[@]}" - systemConfig=$(readlink -f result) + systemConfig=$(nix "${flakeFlags[@]}" build --json \ + "${extraBuildFlags[@]}" "${extraLockFlags[@]}" \ + -- "$flake#$flakeAttr.system" \ + | jq -r '.[0].outputs.out') fi fi |