Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config

Namely, allow {pkgs}: { packageOverrides = p: ...; }; svn path=/nixos/trunk/; revision=29180
2011-09-11 12:41:47 +00:00 · 2011-09-11 12:41:47 +00:00 · c56a8456ed
commit c56a8456ed
parent 9a096c9ee7
1 changed files with 5 additions and 1 deletions
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@ -11,7 +11,11 @@ let
    then f x
    else f;

-  mergeConfig = lhs: rhs:
+  mergeConfig = lhs_: rhs_:
+    let
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
+    in
    lhs // rhs //
    optionalAttrs (lhs ? packageOverrides) {
      packageOverrides = pkgs: