summaryrefslogtreecommitdiffstats
path: root/nixos/lib
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-04-24 13:57:19 +0300
committerVladimír Čunát <vcunat@gmail.com>2016-04-25 16:44:37 +0200
commit60f5659dad9ee8dc8b55f5ec814cd50cd6a8ca96 (patch)
treede17ddec6688300f2018c8dfc4964d5de057296b /nixos/lib
parentbee04a37ad9157fa7992b80df53919759b1ebffd (diff)
treewide: Use correct output in ${config.nix.package}/bin
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/make-disk-image.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index caf0ab4c07b5..63666c99b230 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -81,14 +81,14 @@ pkgs.vmTools.runInLinuxVM (
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
- chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+ chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
# Add missing size/hash fields to the database. FIXME:
# exportReferencesGraph should provide these directly.
- chroot /mnt ${config.nix.package}/bin/nix-store --verify --check-contents
+ chroot /mnt ${config.nix.package.out}/bin/nix-store --verify --check-contents
# Create the system profile to allow nixos-rebuild to work.
- chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \
+ chroot /mnt ${config.nix.package.out}/bin/nix-env --option build-users-group "" \
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
# `nixos-rebuild' requires an /etc/NIXOS.