From 1bcefcdf5caf5f238abd9cc74f4d9738ad505f29 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 19:18:33 +0000
Subject: [PATCH] Under pkgsWithOverrides, replace the last uses of pkgs by the
 corresponding argument.

---
 pkgs/top-level/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index b1d1282d3d64..d335ffb8a377 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -114,18 +114,20 @@ let
   pkgsWithOverrides = overrider:
     let
       stdenvAdapters = self: super:
-        let res = import ../stdenv/adapters.nix pkgs; in res // {
+        let res = import ../stdenv/adapters.nix self; in res // {
           stdenvAdapters = res;
         };
 
       trivialBuilders = self: super:
-        (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
+        (import ../build-support/trivial-builders.nix {
+          inherit lib; inherit (self) stdenv; inherit (self.xorg) lndir;
+        });
 
       stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
 
       allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; };
       allPackages = self: super:
-        let res = import ./all-packages.nix allPackagesArgs res pkgs;
+        let res = import ./all-packages.nix allPackagesArgs res self;
         in res;
 
       aliases = self: super: import ./aliases.nix super;