Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config
Namely, allow {pkgs}: { packageOverrides = p: ...; }; svn path=/nixos/trunk/; revision=29180
This commit is contained in:
parent
9a096c9ee7
commit
c56a8456ed
@ -11,7 +11,11 @@ let
|
|||||||
then f x
|
then f x
|
||||||
else f;
|
else f;
|
||||||
|
|
||||||
mergeConfig = lhs: rhs:
|
mergeConfig = lhs_: rhs_:
|
||||||
|
let
|
||||||
|
lhs = optCall lhs_ { inherit pkgs; };
|
||||||
|
rhs = optCall rhs_ { inherit pkgs; };
|
||||||
|
in
|
||||||
lhs // rhs //
|
lhs // rhs //
|
||||||
optionalAttrs (lhs ? packageOverrides) {
|
optionalAttrs (lhs ? packageOverrides) {
|
||||||
packageOverrides = pkgs:
|
packageOverrides = pkgs:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user