diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-10 20:03:11 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-10 20:03:11 +0200 |
| commit | ca3820dd002ac757518d22efcc7b05c59e67dc54 (patch) | |
| tree | 973623245d7fc38aee692f0118cc8d730bdf3104 /nixos/modules/misc/nixpkgs.nix | |
| parent | 809b38a784ea413b36d188688eb1d2318e6438da (diff) | |
| download | nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar.gz nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar.bz2 nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar.lz nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar.xz nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.tar.zst nixpkgs-ca3820dd002ac757518d22efcc7b05c59e67dc54.zip | |
nixos/misc: Fix nixpkgs.config merge function
Previously nested attrsets would override each other
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e0c192246c0..afb74581e23 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -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 // |