Skip to content

Commit 547096c

Browse files
authored
Merge pull request #122 from DeterminateSystems/custom-settings-default
Provide default value for custom settings
2 parents e74d3f5 + 5a9d86c commit 547096c

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

modules/nix-darwin/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ in
4040
# Support "free-form" options
4141
freeformType = semanticConfType;
4242
};
43+
default = { };
4344
};
4445

4546
config = lib.mkIf (config.determinate-nix.customSettings != { }) {

tests/flake.nix

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,29 @@
3737
system = "aarch64-darwin";
3838

3939
modules = [
40+
determinate.darwinModules.default
4041
{
4142
nix.enable = false;
4243
system.stateVersion = 5;
4344
}
4445
];
4546
}).system;
47+
48+
checks.aarch64-darwin.nix-darwin-custom-config =
49+
(nix-darwin.lib.darwinSystem {
50+
system = "aarch64-darwin";
51+
52+
modules = [
53+
determinate.darwinModules.default
54+
{
55+
nix.enable = false;
56+
system.stateVersion = 5;
57+
determinate-nix.customSettings = {
58+
extra-experimental-features = [ "build-time-fetch-tree" ];
59+
flake-registry = "/etc/nix/flake-registry.json";
60+
};
61+
}
62+
];
63+
}).system;
4664
};
4765
}

0 commit comments

Comments
 (0)