From 685335df2f2275a07ab759f05e764f851a1e06b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Sep 2009 09:29:18 +0000
Subject: [PATCH] * system.build.system -> system.build.toplevel, since the
 former name   is just too weird.

svn path=/nixos/trunk/; revision=16954
---
 default.nix                             | 2 +-
 modules/installer/cd-dvd/iso-image.nix  | 4 ++--
 modules/installer/cd-dvd/live-dvd.nix   | 2 +-
 modules/system/activation/top-level.nix | 2 +-
 modules/virtualisation/qemu-vm.nix      | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 28049ebd146a..cf16a81acfba 100644
--- a/default.nix
+++ b/default.nix
@@ -16,7 +16,7 @@ in
 {
   inherit eval config;
 
-  system = config.system.build.system;
+  system = config.system.build.toplevel;
 
   vm = vmConfig.system.build.vm;
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 3b26628148fc..bd4d39ccdf82 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -98,7 +98,7 @@ in
   # script and the top-level system configuration directory.
   isoImage.storeContents =
     [ config.system.build.bootStage2
-      config.system.build.system
+      config.system.build.toplevel
     ];
 
   # Create the squashfs image that contains the Nix store.
@@ -137,7 +137,7 @@ in
         # menu.lst.  Break the cyclic dependency by having a /system
         # symlink on the CD, and having menu.lst refer to /system.
         source = pkgs.runCommand "system" {}
-          "ln -s ${config.system.build.system} $out";
+          "ln -s ${config.system.build.toplevel} $out";
         target = "/system";
       }
       { # Idem for the stage-2 init script.
diff --git a/modules/installer/cd-dvd/live-dvd.nix b/modules/installer/cd-dvd/live-dvd.nix
index dde8dd9930d0..aa8a164c0335 100644
--- a/modules/installer/cd-dvd/live-dvd.nix
+++ b/modules/installer/cd-dvd/live-dvd.nix
@@ -5,7 +5,7 @@
 
   # Build the build-time dependencies of this configuration on the DVD
   # to speed up installation.
-  isoImage.storeContents = [config.system.build.system.drvPath];
+  isoImage.storeContents = [config.system.build.toplevel.drvPath];
 
   # Include lots of packages.
   environment.systemPackages =
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index 124c39e5b51a..194575134734 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -92,5 +92,5 @@ let
 in {
   require = [options];
 
-  system.build.system = system;
+  system.build.toplevel = system;
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index f804a63395d1..69cc73954e0a 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -48,10 +48,10 @@ let
           -no-kvm-irqchip \
           -net nic,model=virtio -net user -smb / \
           -drive file=$NIX_DISK_IMAGE,if=virtio,boot=on \
-          -kernel ${config.system.build.system}/kernel \
-          -initrd ${config.system.build.system}/initrd \
+          -kernel ${config.system.build.toplevel}/kernel \
+          -initrd ${config.system.build.toplevel}/initrd \
           $QEMU_OPTS \
-          -append "$(cat ${config.system.build.system}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} $QEMU_KERNEL_PARAMS"
+          -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} $QEMU_KERNEL_PARAMS"
     '';
 
 in
@@ -122,7 +122,7 @@ in
   system.build.vm = pkgs.runCommand "nixos-vm" {}
     ''
       ensureDir $out/bin
-      ln -s ${config.system.build.system} $out/system
+      ln -s ${config.system.build.toplevel} $out/system
       ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
     '';