diff options
| author | Samuel Gräfenstein <git@samuelgrf.com> | 2021-05-23 02:07:03 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-06-15 08:15:31 -0700 |
| commit | ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50 (patch) | |
| tree | 6ba7069f35666911eaf16de49195956f253217eb /pkgs/os-specific/linux/nixos-rebuild | |
| parent | 0e98d7acabffab8ad05ae46c2a32c7ed624928ef (diff) | |
| download | nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar.gz nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar.bz2 nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar.lz nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar.xz nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.tar.zst nixpkgs-ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50.zip | |
nixos-rebuild: fix creating ./result symlink for flakes
Diffstat (limited to 'pkgs/os-specific/linux/nixos-rebuild')
| -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 5522fa6a456..d6853bf4729 100644..100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -210,7 +210,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 |