diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e1c705eef3b5a..37f8d2d5fb177 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -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: