mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

Merge 9e6b09635f into 53d0f0ed11

Browse source
This commit is contained in:
Oliver Wiegers 2025-03-29 15:35:56 +00:00 • committed by GitHub
commit 14f913eff7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eval-config.nix
View file

@ -17,6 +17,7 @@ in
{ lib
, modules
, baseModules ? import ./modules/module-list.nix
, extraModules ? []
, specialArgs ? { }
, check ? true
, enableNixpkgsReleaseCheck ? true
@ -72,14 +73,14 @@ let
_file = ./eval-config.nix;
config = {
_module.args = {
inherit baseModules modules;
inherit baseModules extraModules modules;
};
};
};
eval = lib.evalModules (builtins.removeAttrs args [ "lib" "enableNixpkgsReleaseCheck" ] // {
eval = lib.evalModules (builtins.removeAttrs args [ "lib" "enableNixpkgsReleaseCheck" "extraModules" ] // {
class = "darwin";
modules = modules ++ [ argsModule ] ++ baseModules;
modules = baseModules ++ extraModules ++ modules ++ [ argsModule ];
specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
});

4
flake.nix
View file

@ -18,11 +18,13 @@
lib = {
evalConfig = import ./eval-config.nix;
darwinSystem = args@{ modules, ... }: self.lib.evalConfig (
darwinSystem = args@{ modules, extraModules ? [], ... }: self.lib.evalConfig (
{ inherit (nixpkgs) lib; }
// nixpkgs.lib.optionalAttrs (args ? pkgs) { inherit (args.pkgs) lib; }
// builtins.removeAttrs args [ "system" "pkgs" "inputs" ]
// {
inherit extraModules;
modules = modules
++ nixpkgs.lib.optional (args ? pkgs) ({ lib, ... }: {
_module.args.pkgs = lib.mkForce args.pkgs;