movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/misc: Fix nixpkgs.config merge function

Browse source 
Previously nested attrsets would override each other
This commit is contained in:
Silvan Mosberger 2019-08-10 20:03:11 +02:00
parent 809b38a784
commit ca3820dd00
No known key found for this signature in database
GPG key ID: 9424360B4B85C9E7
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/misc/nixpkgs.nix
View file

@ -19,7 +19,7 @@ let
lhs = optCall lhs_ { inherit pkgs; }; lhs = optCall lhs_ { inherit pkgs; };
rhs = optCall rhs_ { inherit pkgs; }; rhs = optCall rhs_ { inherit pkgs; };
in in
lhs // rhs // recursiveUpdate lhs rhs //
optionalAttrs (lhs ? packageOverrides) { optionalAttrs (lhs ? packageOverrides) {
packageOverrides = pkgs: packageOverrides = pkgs:
optCall lhs.packageOverrides pkgs // optCall lhs.packageOverrides pkgs //