Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion nixos/modules/misc/nixpkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,19 @@ let
lhs = optCall lhs_ { inherit pkgs; };
rhs = optCall rhs_ { inherit pkgs; };
in
lib.recursiveUpdate lhs rhs
(lib.zipAttrsWith
(
name: values:
let
rhs' = lib.elemAt values 0;
in
if builtins.isList rhs' then lib.concatLists values else rhs'
)
[
lhs
rhs
]
)
// lib.optionalAttrs (lhs ? packageOverrides) {
packageOverrides =
pkgs:
Expand Down