cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/system.disableInstallerTools: Do define options without effect

Browse source 
These won't cause anything to appear in toplevel.
This commit is contained in:
Robert Hensing 2023-11-19 21:21:16 +01:00
parent 66b2913797
commit 64b587e3e2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/installer/tools/tools.nix
View file

@ -130,7 +130,7 @@ in
''; '';
}; };
config = lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) { config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {
system.nixos-generate-config.configuration = mkDefault '' system.nixos-generate-config.configuration = mkDefault ''
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
@ -257,10 +257,13 @@ in
documentation.man.man-db.skipPackages = [ nixos-version ]; documentation.man.man-db.skipPackages = [ nixos-version ];
})
# These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
({
system.build = { system.build = {
inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
}; };
})];
};
} }