mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-13 20:30:02 +00:00
nixpkgs: Allow functors.
Replace builtins.isFunction with lib.isFunction, which allows functors.
This commit is contained in:
parent
15635ae638
commit
e5ba780a76
1 changed files with 3 additions and 3 deletions
|
@ -4,10 +4,10 @@ with lib;
|
|||
|
||||
let
|
||||
isConfig = x:
|
||||
builtins.isAttrs x || builtins.isFunction x;
|
||||
builtins.isAttrs x || lib.isFunction x;
|
||||
|
||||
optCall = f: x:
|
||||
if builtins.isFunction f
|
||||
if lib.isFunction f
|
||||
then f x
|
||||
else f;
|
||||
|
||||
|
@ -41,7 +41,7 @@ let
|
|||
overlayType = mkOptionType {
|
||||
name = "nixpkgs-overlay";
|
||||
description = "nixpkgs overlay";
|
||||
check = builtins.isFunction;
|
||||
check = lib.isFunction;
|
||||
merge = lib.mergeOneOption;
|
||||
};
|
||||
in
|
||||
|
|
Loading…
Add table
Reference in a new issue