about summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authornicoo2024-07-26 19:19:38 +0000
committerGitHub2024-07-26 19:19:38 +0000
commit9587ddd261329f6a90900233a3542efd5c32d4f0 (patch)
tree54c069559d4d5791cacbb1b07ac8ac2a505dd997 /nixos/modules/config
parent50f152c3753f1414abda7b8e704ab5b9cb3f8330 (diff)
nixos/nix-channel: don't set `nix-path` (#327683)
Otherwise, the empty path in `nix.conf` takes precedence over `NIX_PATH`,
and by extension the `nix.nixPath` configuration option.

Introduced in 61afc4d1662fe426f02b28e386f2e053f887b6d6.
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/nix-channel.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix
index 6498ce6c469c..3cdd1d1b6366 100644
--- a/nixos/modules/config/nix-channel.nix
+++ b/nixos/modules/config/nix-channel.nix
@@ -94,8 +94,6 @@ in
       NIX_PATH = cfg.nixPath;
     };
 
-    nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");
-
     systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [
       ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n''
     ];