diff options
author | Robert Hensing <robert@roberthensing.nl> | 2023-11-19 21:21:16 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2023-11-19 21:21:16 +0100 |
commit | 64b587e3e22dc078cd4c73d2d8f5331d8321ae65 (patch) | |
tree | df2e04a24161fa733513305f80713cfc00bf73d8 /nixos/modules/installer/tools/tools.nix | |
parent | 66b29137978dcca809ffdfba8d9d7d7f7f6a114b (diff) |
nixos/system.disableInstallerTools: Do define options without effect
These won't cause anything to appear in toplevel.
Diffstat (limited to 'nixos/modules/installer/tools/tools.nix')
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 15e10128ac9a..9ccc76a82c95 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -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 '' # Edit this configuration file to define what should be installed on @@ -257,10 +257,13 @@ in 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 = { inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; }; - - }; + })]; } |