mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-09-11 12:49:18 +03:00
Revert "eval-config: set class
"
This commit is contained in:
parent
8f0e02cfc8
commit
a5b09580e2
@ -16,7 +16,6 @@ let
|
||||
};
|
||||
|
||||
eval = lib.evalModules (builtins.removeAttrs args [ "lib" ] // {
|
||||
class = "darwin";
|
||||
modules = modules ++ [ argsModule ] ++ baseModules;
|
||||
specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs;
|
||||
});
|
||||
|
@ -11,9 +11,9 @@ let
|
||||
regularConfig = config;
|
||||
|
||||
argsModule = {
|
||||
config._module.args = lib.mkForce (regularConfig._module.args // {
|
||||
config._module.args = regularConfig._module.args // {
|
||||
modules = [ ];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
/* For the purpose of generating docs, evaluate options with each derivation
|
||||
@ -28,9 +28,8 @@ let
|
||||
inherit (config.system) nixpkgsRevision;
|
||||
options =
|
||||
let
|
||||
scrubbedEval = import ../../eval-config.nix {
|
||||
inherit lib;
|
||||
modules = [ argsModule ];
|
||||
scrubbedEval = evalModules {
|
||||
modules = baseModules ++ [ argsModule ];
|
||||
specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
|
||||
};
|
||||
scrubDerivations = namePrefix: pkgSet: mapAttrs
|
||||
|
Loading…
Reference in New Issue
Block a user