Skip to content

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

(cherry picked from commit ca3820d)
  • Loading branch information
infinisil committed Aug 10, 2019
1 parent 3590ff2 commit 68dd778
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/modules/misc/nixpkgs.nix
Original file line number Diff line number Diff line change
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 68dd778

Please sign in to comment.