diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index 78c52bca201f..73332bd96a8c 100644 --- a/modules/misc/nixpkgs.nix +++ b/modules/misc/nixpkgs.nix @@ -11,7 +11,11 @@ let then f x else f; - mergeConfig = lhs: rhs: + mergeConfig = lhs_: rhs_: + let + lhs = optCall lhs_ { inherit pkgs; }; + rhs = optCall rhs_ { inherit pkgs; }; + in lhs // rhs // optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: