From 74a0e71ff2aee5ea905382b13f7635bd371b369e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 6 Sep 2022 20:55:00 +0200 Subject: [PATCH] eval-config: make lib overridable This enables using flake lib.darwinSystem function with your custom lib. --- eval-config.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eval-config.nix b/eval-config.nix index af7849f2..c30d88c7 100644 --- a/eval-config.nix +++ b/eval-config.nix @@ -1,7 +1,11 @@ { lib }: +let + nixpkgs-lib = lib; +in { system ? builtins.currentSystem or "x86_64-darwin" , pkgs ? null +, lib ? nixpkgs-lib , modules , inputs , baseModules ? import ./modules/module-list.nix @@ -44,7 +48,7 @@ let literalDocBook = super.literalDocBook or super.literalExample; }); - eval = libExtended.evalModules (builtins.removeAttrs args [ "inputs" "pkgs" "system" ] // { + eval = libExtended.evalModules (builtins.removeAttrs args [ "lib" "inputs" "pkgs" "system" ] // { modules = modules ++ [ argsModule pkgsModule ] ++ baseModules; specialArgs = { modulesPath = builtins.toString ./modules; } // specialArgs; });