public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126960 from NixOS/backport-123720-to-release-21.05

Browse Source 
[Backport release-21.05] nixos-rebuild: fix creating ./result symlink for flakes
This commit is contained in:
Artturi
2021-08-06 16:59:35 +03:00
committed by GitHub
parent 6a694d5e9e 044a0d06c7
commit 0cc1a01d6a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
Regular → Executable
+6 -1
View File
@@ -216,7 +216,12 @@ nixBuild() {
} }
nixFlakeBuild() { 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" nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result"
readlink -f "${tmpDir}/result" readlink -f "${tmpDir}/result"
else else