public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the merge of the overrides from pkgsFun to applyGlobalOverrides.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 15:17:34 +00:00
parent 054327729c
commit 007500f2ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -109,7 +109,7 @@ let
(pkgs.stdenv.overrides pkgs); (pkgs.stdenv.overrides pkgs);
# The un-overriden packages, passed to `overrider'. # The un-overriden packages, passed to `overrider'.
pkgsInit = pkgsFun pkgs {}; pkgsInit = pkgsFun pkgs;
# Return the complete set of packages, after applying the overrides # Return the complete set of packages, after applying the overrides
# returned by the `overrider' function (see above). Warning: this # returned by the `overrider' function (see above). Warning: this
@ -119,11 +119,11 @@ let
overrides = overrider pkgs pkgsOrig // stdenvOverrides pkgsOrig; overrides = overrider pkgs pkgsOrig // stdenvOverrides pkgsOrig;
# The overriden, final packages. # The overriden, final packages.
pkgs = pkgsFun pkgs overrides; pkgs = pkgsFun pkgs // overrides;
in pkgs; in pkgs;
# The package compositions. Yes, this isn't properly indented. # The package compositions. Yes, this isn't properly indented.
pkgsFun = pkgs: overrides: pkgsFun = pkgs:
let let
defaultScope = pkgs // pkgs.xorg; defaultScope = pkgs // pkgs.xorg;
@ -16449,7 +16449,7 @@ let
aliases = import ./aliases.nix self; aliases = import ./aliases.nix self;
in in
helperFunctions // stdenvDefault // self // aliases // overrides; helperFunctions // stdenvDefault // self // aliases;
in in
pkgs pkgs