From acaa99cbd2db20fad9ee63118d0828f0f237709a Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Fri, 18 Mar 2016 20:36:00 +0000 Subject: [PATCH] Move applyGlobalOverrides comment to stdenvOverrides, where it fits better. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7d688855074..1798b120cd10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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.