From fd38f55c96d633da672027960aa8212a1c6c86e2 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 12 Aug 2024 14:00:26 +0200 Subject: lib: fix merging of functions --- lib/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/options.nix b/lib/options.nix index f4d0d9d36cfc..8c9899a58e8c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -246,7 +246,7 @@ rec { mergeDefaultOption = loc: defs: let list = getValues defs; in if length list == 1 then head list - else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list) + else if all isFunction list then x: mergeDefaultOption loc (map (def: def // { value = def.value x; }) defs) else if all isList list then concatLists list else if all isAttrs list then foldl' lib.mergeAttrs {} list else if all isBool list then foldl' lib.or false list -- cgit v1.2.3