nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move applyGlobalOverrides comment to stdenvOverrides, where it fits better.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-18 20:36:00 +00:00
parent 00963c3dfd
commit acaa99cbd2
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

@ -97,6 +97,10 @@ let
# 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.
#
# We don't want stdenv overrides in the case of cross-building, or
# otherwise the basic overrided packages will not be built with the
# crossStdenv adapter.
stdenvOverrides = pkgs:
lib.optionalAttrs (pkgs.stdenv ? overrides && crossSystem == null)
(pkgs.stdenv.overrides pkgs);
@ -109,10 +113,6 @@ let
# function is very expensive!
applyGlobalOverrides = pkgsOrig: overrider:
let
# Call the overrider function. We don't want stdenv overrides
# in the case of cross-building, or otherwise the basic
# overrided packages will not be built with the crossStdenv
# adapter.
overrides = mkOverrides pkgsOrig (overrider pkgs pkgsOrig);
# The overriden, final packages.