diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2016-01-11 19:43:05 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2016-01-20 10:01:59 +0100 |
| commit | 51c6383ebd10ea58094e80bdb0ead73b838f8b9c (patch) | |
| tree | 68ccc9f975061f70ecb568123e18a2002eb55680 /nixos | |
| parent | fb2eae08d53606823051dead0d07b6461e82ec1b (diff) | |
| download | nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar.gz nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar.bz2 nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar.lz nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar.xz nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.tar.zst nixlib-51c6383ebd10ea58094e80bdb0ead73b838f8b9c.zip | |
nixos-rebuild: Build only the 'out' output of nix (not 'doc' and 'debug' too)
This fixes the failing NixOS installer tests.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 1071460097e8..105d1cd16252 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -270,9 +270,9 @@ remotePATH= if [ -n "$buildNix" ]; then echo "building Nix..." >&2 nixDrv= - if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nixdrv --indirect -A nix "${extraBuildFlags[@]}")"; then + 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 nixFallback "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then nixStorePath="$(prebuiltNix "$(uname -m)")" if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ --option extra-binary-caches https://cache.nixos.org/; then @@ -293,7 +293,7 @@ if [ -n "$buildNix" ]; then fi fi if [ -a "$nixDrv" ]; then - nix-store -r "$nixDrv" --add-root $tmpDir/nix --indirect >/dev/null + nix-store -r "$nixDrv"'!'"out" --add-root $tmpDir/nix --indirect >/dev/null if [ -n "$buildHost" ]; then nix-copy-closure --to "$buildHost" "$nixDrv" # The nix build produces multiple outputs, we add them all to the remote path |