diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:28:04 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:57 +0100 |
| commit | 259f7a93b1e679b73026352b40029375aa94db7c (patch) | |
| tree | 353259f8f7622375aa0a584e31ad16c20f95a6a3 /nixos/modules/virtualisation | |
| parent | 44d6d887390bbf0fd99d2bf95d75e6292357fd50 (diff) | |
| download | nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.gz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.bz2 nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.lz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.xz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.zst nixlib-259f7a93b1e679b73026352b40029375aa94db7c.zip | |
Rename environment.nix -> nix.package
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/nova-image.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-image.nix | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7e04f0d29114..cfc582170e6c 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -40,10 +40,10 @@ with pkgs.lib; # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.environment.nix}/bin/nix-store --load-db + chroot /mnt ${config.nix.package}/bin/nix-store --load-db # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.environment.nix}/bin/nix-env \ + chroot /mnt ${config.nix.package}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index ab625dba11d3..5c9481b71278 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -46,10 +46,10 @@ with pkgs.lib; # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.environment.nix}/bin/nix-store --load-db + chroot /mnt ${config.nix.package}/bin/nix-store --load-db # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.environment.nix}/bin/nix-env \ + chroot /mnt ${config.nix.package}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 708b462e0e5d..6648b6514d01 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -329,7 +329,7 @@ in boot.postBootCommands = '' if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then - ${config.environment.nix}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} + ${config.nix.package}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} fi ''; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index e1b6def8edb3..bea6414c4504 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -53,10 +53,10 @@ with pkgs.lib; # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.environment.nix}/bin/nix-store --load-db + chroot /mnt ${config.nix.package}/bin/nix-store --load-db # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.environment.nix}/bin/nix-env \ + chroot /mnt ${config.nix.package}/bin/nix-env \ -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} # `nixos-rebuild' requires an /etc/NIXOS. |