about summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2022-03-24 17:01:47 +0100
committerGitHub <noreply@github.com>2022-03-24 17:01:47 +0100
commitce5a33e62bea14024af8bfad23b54c8848a89d9e (patch)
tree6b85cec1750e456d6f852cb3e0a07b4694414b1f /nixos/modules/installer
parent6ea8d5ee71793e236a19af3b5686a1ccdb0af3da (diff)
parent6c469679f6dea7f0cefafcac7e9d95b98bf8ff55 (diff)
downloadnixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar.gz
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar.bz2
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar.lz
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar.xz
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.tar.zst
nixlib-ce5a33e62bea14024af8bfad23b54c8848a89d9e.zip
Merge pull request #164660 from ncfavier/tests-restrict-arguments
nixos/testing: restrict arguments to makeTest
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/tools/tools.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 71aaf7f253d9..2e088b977710 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -117,7 +117,7 @@ in
     '';
   };
 
-  config = lib.mkIf (!config.system.disableInstallerTools) {
+  config = 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