diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-24 14:06:04 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-25 16:44:38 +0200 |
commit | 1d4b21ef42a41fcecc254f61f279ad306f41e6b3 (patch) | |
tree | 6e2cc9500ac56590d4c7b8fcdd3be22914579676 /nixos/modules/installer/tools/nixos-rebuild.sh | |
parent | 60f5659dad9ee8dc8b55f5ec814cd50cd6a8ca96 (diff) | |
download | nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar.gz nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar.bz2 nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar.lz nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar.xz nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.tar.zst nixlib-1d4b21ef42a41fcecc254f61f279ad306f41e6b3.zip |
treewide: Use correct output of config.nix.package in non-string contexts
Diffstat (limited to 'nixos/modules/installer/tools/nixos-rebuild.sh')
-rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index cd30958d9e8a..5ecdcdb3cdb5 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -271,7 +271,7 @@ remotePATH= if [ -n "$buildNix" ]; then echo "building Nix..." >&2 nixDrv= - if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then nixStorePath="$(prebuiltNix "$(uname -m)")" |