diff options
| author | Samuel Gräfenstein <git@samuelgrf.com> | 2021-05-23 02:07:03 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-15 15:21:24 +0000 |
| commit | 044a0d06c736e94dcbb33fd6ece6bfb5be15caff (patch) | |
| tree | 669aff325294e9e9aa9b7213207abf0387261c0f | |
| parent | Merge pull request #126956 from NixOS/backport-126892-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-123720-to-release-21.05.tar.gz | |
nixos-rebuild: fix creating ./result symlink for flakesorigin/backport-123720-to-release-21.05
(cherry picked from commit 531dc2e0f12673cce9cc6ea3dc5fd8bfef39c9bf)
| -rwxr-xr-x[-rw-r--r--] | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 2b94f18f5386..890c070a27aa 100644..100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -215,7 +215,12 @@ nixBuild() { } nixFlakeBuild() { - if [ -z "$buildHost" ]; then + if [[ -z "$buildHost" && -z "$targetHost" ]] && + ! [ "$action" = switch -o "$action" = boot ] + then + nix "${flakeFlags[@]}" build "$@" + readlink -f ./result + elif [ -z "$buildHost" ]; then nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" readlink -f "${tmpDir}/result" else |