nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: Rename extraConfig to extraOptions

Browse source
This commit is contained in:
Zhong Jianxin 2022-04-11 10:44:25 +08:00
parent 6c59137a11
commit 2ad1fd7f68
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/environment/nix.nix
View file

@ -20,6 +20,7 @@ in
imports = [ imports = [
(renameNixOpt "binaryCaches" "substituters") (renameNixOpt "binaryCaches" "substituters")
(renameNixOpt "binaryCachePublicKeys" "trustedPublicKeys") (renameNixOpt "binaryCachePublicKeys" "trustedPublicKeys")
(renameNixOpt "extraConfig" "extraOptions")
]; ];
###### interface ###### interface
@ -124,7 +125,7 @@ in
''; '';
}; };
extraConfig = mkOption { extraOptions = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
description = "Extra config to be appended to /etc/nix/nix.conf."; description = "Extra config to be appended to /etc/nix/nix.conf.";
@ -143,7 +144,7 @@ in
sandbox = false sandbox = false
substituters = ${concatStringsSep " " cfg.substituters} substituters = ${concatStringsSep " " cfg.substituters}
trusted-public-keys = ${concatStringsSep " " cfg.trustedPublicKeys} trusted-public-keys = ${concatStringsSep " " cfg.trustedPublicKeys}
${cfg.extraConfig} ${cfg.extraOptions}
''; '';
"nix/registry.json".text = builtins.toJSON { "nix/registry.json".text = builtins.toJSON {