From c56a8456edf076d0ff4f82e21a997dd32fe8926a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 11 Sep 2011 12:41:47 +0000
Subject: [PATCH] Allow full ~/.nixpkgs/config.nix syntax in nixpkgs.config

Namely, allow {pkgs}: { packageOverrides = p: ...; };

svn path=/nixos/trunk/; revision=29180
---
 modules/misc/nixpkgs.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 78c52bca201..73332bd96a8 100644
--- 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: