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

Move mkOverrides under applyGlobalOverrides.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-18 20:56:40 +00:00
parent acaa99cbd2
commit 71b2fd92b3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,8 +92,6 @@ let
# ... pkgs.foo ..."). # ... pkgs.foo ...").
pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {})); pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {}));
mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
# stdenvOverrides is used to avoid circular dependencies for building the # stdenvOverrides is used to avoid circular dependencies for building the
# standard build environment. This mechanism use the override mechanism to # standard build environment. This mechanism use the override mechanism to
# implement some staged compilation of the stdenv. # implement some staged compilation of the stdenv.
@ -113,13 +111,14 @@ let
# function is very expensive! # function is very expensive!
applyGlobalOverrides = pkgsOrig: overrider: applyGlobalOverrides = pkgsOrig: overrider:
let let
mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
overrides = mkOverrides pkgsOrig (overrider pkgs pkgsOrig); overrides = mkOverrides pkgsOrig (overrider pkgs 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: overrides:
let let