movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-25 10:36:36 +03:00
Code Activity

nixos-rebuild: Use /etc/nixos/flake.nix if it exists

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-19 14:40:24 +02:00
parent 26e4d09c9c
commit cfd468adbb
2 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-rebuild.sh
View file

@ -236,6 +236,12 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then
export PATH=@nix@/bin:$PATH
fi
# Use /etc/nixos/flake.nix if it exists. It can be a symlink to the
# actual flake.
if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then
flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")"
fi
# Re-execute nixos-rebuild from the Nixpkgs tree.
# FIXME: get nixos-rebuild from $flake.
if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then