diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-10-08 20:48:43 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-05 23:15:18 +0100 |
| commit | 2452042c47859666c2ad89fdfd47e5c0a55c0af2 (patch) | |
| tree | 312ff573b9221431da5051104e0af544a37b76d3 /nixos/modules/installer | |
| parent | 98e322b929bdc141c630d5c615d18ed487d4abd6 (diff) | |
| download | nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar.gz nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar.bz2 nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar.lz nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar.xz nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.tar.zst nixlib-2452042c47859666c2ad89fdfd47e5c0a55c0af2.zip | |
nixos-rebuild: Support -L flag
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index ec9dd9b71d40..8d69bbfd14c0 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -61,7 +61,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L) extraBuildFlags+=("$i") ;; --option) @@ -268,7 +268,7 @@ fi # Resolve the flake. if [[ -n $flake ]]; then - flake=$(nix flake info --json -- "$flake" | jq -r .url) + flake=$(nix flake info --json "${extraBuildFlags[@]}" -- "$flake" | jq -r .url) fi # Find configuration.nix and open editor instead of building. @@ -401,7 +401,8 @@ if [ -z "$rollback" ]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")" else outLink=$tmpDir/result - nix build "$flake#$flakeAttr.config.system.build.toplevel" --keep-going "${extraBuildFlags[@]}" --out-link $outLink + nix build "$flake#$flakeAttr.config.system.build.toplevel" \ + --keep-going "${extraBuildFlags[@]}" --out-link $outLink pathToConfig="$(readlink -f $outLink)" fi copyToTarget "$pathToConfig" |