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/installer/cd-dvd/iso-image.nix | |
parent | 44d6d887390bbf0fd99d2bf95d75e6292357fd50 (diff) | |
download | nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.gz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.bz2 nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.lz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.xz nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.tar.zst nixpkgs-259f7a93b1e679b73026352b40029375aa94db7c.zip |
Rename environment.nix -> nix.package
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index de9728d677c..b803a3f188b 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -298,12 +298,12 @@ in '' # After booting, register the contents of the Nix store on the # CD in the Nix database in the tmpfs. - ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration + ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration # nixos-rebuild also requires a "system" profile and an # /etc/NIXOS tag. touch /etc/NIXOS - ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; # Add vfat support to the initrd to enable people to copy the |