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

Extract stdenvOverrides function out of mkOverrides function.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-17 21:24:53 +00:00
parent a5188bda7b
commit 00963c3dfd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,8 +92,14 @@ let
# ... pkgs.foo ..."). # ... pkgs.foo ...").
pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {})); pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {}));
mkOverrides = pkgsOrig: overrides: overrides // mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
(lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
# stdenvOverrides is used to avoid circular dependencies for building the
# standard build environment. This mechanism use the override mechanism to
# implement some staged compilation of the stdenv.
stdenvOverrides = pkgs:
lib.optionalAttrs (pkgs.stdenv ? overrides && crossSystem == null)
(pkgs.stdenv.overrides pkgs);
# The un-overriden packages, passed to `overrider'. # The un-overriden packages, passed to `overrider'.
pkgsInit = pkgsFun pkgs {}; pkgsInit = pkgsFun pkgs {};