diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-09-19 14:40:24 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-05 23:15:18 +0100 |
| commit | cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c (patch) | |
| tree | 4fbfebbeb7ffd732a768e87946fc1a48fdac00f5 /nixos/modules/installer/tools/nixos-rebuild.sh | |
| parent | 26e4d09c9cd847a0453d3edb730b9dfe3b1add57 (diff) | |
| download | nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar.gz nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar.bz2 nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar.lz nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar.xz nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.tar.zst nixlib-cfd468adbb9b8b5430a6cecf02d8f6ff76e7360c.zip | |
nixos-rebuild: Use /etc/nixos/flake.nix if it exists
Diffstat (limited to 'nixos/modules/installer/tools/nixos-rebuild.sh')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 949cd8691465..18088e4f9ea4 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -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 |