nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix.nixPath: Do not use environment.darwinConfig if set to null (#1469)

Browse source
This commit is contained in:
Sam 2025-06-22 18:56:08 +00:00 • committed by GitHub
commit 1dd19f19e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/nix/default.nix
View file

@ -443,11 +443,14 @@ in
nixPath = mkOption {
type = nixPathType;
inherit (managedDefault "nix.nixPath" (
lib.optionals cfg.channel.enable [
# Include default path <darwin-config>.
{ darwin-config = "${config.environment.darwinConfig}"; }
"/nix/var/nix/profiles/per-user/root/channels"
]
lib.optionals cfg.channel.enable (
lib.optionals (config.environment.darwinConfig != null) [
# Include default path <darwin-config>.
{ darwin-config = "${config.environment.darwinConfig}"; }
] ++ [
"/nix/var/nix/profiles/per-user/root/channels"
]
)
)) default;
defaultText = lib.literalExpression ''