Remove uses of nix.extraOptions.
This lets me override individual variables using nix's module system.
This commit is contained in:
parent
568440f3f1
commit
906741bfcf
@ -108,10 +108,8 @@
|
|||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
# Keep outputs so we can build offline.
|
# Keep outputs so we can build offline.
|
||||||
nix.extraOptions = ''
|
nix.settings.keep-outputs = true;
|
||||||
keep-outputs = true
|
nix.settings.keep-derivations = true;
|
||||||
keep-derivations = true
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Automatic garbage collection
|
# Automatic garbage collection
|
||||||
nix.gc = lib.mkIf (!config.me.buildingPortable) {
|
nix.gc = lib.mkIf (!config.me.buildingPortable) {
|
||||||
|
|||||||
@ -19,10 +19,7 @@
|
|||||||
|
|
||||||
config = lib.mkIf config.me.dont_use_substituters.enable {
|
config = lib.mkIf config.me.dont_use_substituters.enable {
|
||||||
# Disable substituters to avoid risk of cache poisoning.
|
# Disable substituters to avoid risk of cache poisoning.
|
||||||
nix.extraOptions = ''
|
nix.settings.substitute = false;
|
||||||
substitute = false
|
|
||||||
'';
|
|
||||||
|
|
||||||
nix.settings.substituters = lib.mkForce [ ];
|
nix.settings.substituters = lib.mkForce [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user