Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
nixos/misc: Fix nixpkgs.config merge function
Browse files Browse the repository at this point in the history
Previously nested attrsets would override each other
  • Loading branch information
infinisil committed Aug 10, 2019
1 parent 809b38a commit ca3820d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/modules/misc/nixpkgs.nix
Expand Up @@ -19,7 +19,7 @@ let
lhs = optCall lhs_ { inherit pkgs; };
rhs = optCall rhs_ { inherit pkgs; };
in
lhs // rhs //
recursiveUpdate lhs rhs //
optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs:
optCall lhs.packageOverrides pkgs //
Expand Down

0 comments on commit ca3820d

Please sign in to comment.