Under pkgsFun, move the merge of helper functions from self_ to self.

This commit is contained in:
Nicolas B. Pierron 2016-03-19 14:02:20 +00:00
parent a658645e1e
commit ffcb6682bc

View File

@ -121,7 +121,7 @@ let
pkgsFun = pkgs: overrides:
let
defaultScope = pkgs // pkgs.xorg;
self = self_ // overrides;
self = helperFunctions // self_ // overrides;
# Helper functions that are exported through `pkgs'.
helperFunctions =
@ -131,7 +131,7 @@ let
stdenvAdapters =
import ../stdenv/adapters.nix pkgs;
self_ = with self; helperFunctions // {
self_ = with self; {
# Make some arguments passed to all-packages.nix available
inherit system platform;