diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-04-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-18 12:56:30 +0000 |
| commit | 2e6b796761672e0e3ed685487007bb0d99126d91 (patch) | |
| tree | 530c7866ba30fa6480e24da2d603bac7b292a0e1 /nixos/modules/system/activation/top-level.nix | |
| parent | 09512be289819507ca53d7f7be5e4b712b78283d (diff) | |
| download | nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar.gz nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar.bz2 nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar.lz nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar.xz nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.tar.zst nixpkgs-2e6b796761672e0e3ed685487007bb0d99126d91.zip | |
nixos: rename config.system.nixos* -> config.system.nixos.*
Diffstat (limited to 'nixos/modules/system/activation/top-level.nix')
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 743c146b026..091a2e412ee 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -108,7 +108,7 @@ let if [] == failed then pkgs.stdenvNoCC.mkDerivation { name = let hn = config.networking.hostName; nn = if (hn != "") then hn else "unnamed"; - in "nixos-system-${nn}-${config.system.nixosLabel}"; + in "nixos-system-${nn}-${config.system.nixos.label}"; preferLocalBuild = true; allowSubstitutes = false; buildCommand = systemBuilder; @@ -122,7 +122,7 @@ let config.system.build.installBootLoader or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true"; activationScript = config.system.activationScripts.script; - nixosLabel = config.system.nixosLabel; + nixosLabel = config.system.nixos.label; configurationName = config.boot.loader.grub.configurationName; |