Under pkgsFun, move the merge of helper functions from self_ to self.
This commit is contained in:
parent
a658645e1e
commit
ffcb6682bc
1 changed files with 2 additions and 2 deletions
|
@ -121,7 +121,7 @@ let
|
||||||
pkgsFun = pkgs: overrides:
|
pkgsFun = pkgs: overrides:
|
||||||
let
|
let
|
||||||
defaultScope = pkgs // pkgs.xorg;
|
defaultScope = pkgs // pkgs.xorg;
|
||||||
self = self_ // overrides;
|
self = helperFunctions // self_ // overrides;
|
||||||
|
|
||||||
# Helper functions that are exported through `pkgs'.
|
# Helper functions that are exported through `pkgs'.
|
||||||
helperFunctions =
|
helperFunctions =
|
||||||
|
@ -131,7 +131,7 @@ let
|
||||||
stdenvAdapters =
|
stdenvAdapters =
|
||||||
import ../stdenv/adapters.nix pkgs;
|
import ../stdenv/adapters.nix pkgs;
|
||||||
|
|
||||||
self_ = with self; helperFunctions // {
|
self_ = with self; {
|
||||||
|
|
||||||
# Make some arguments passed to all-packages.nix available
|
# Make some arguments passed to all-packages.nix available
|
||||||
inherit system platform;
|
inherit system platform;
|
||||||
|
|
Loading…
Reference in a new issue