diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:26:57 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:26:57 +0000 |
| commit | aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be (patch) | |
| tree | 5aa73f522c561befbd6497e0b7cc19e7e4fae1ea /pkgs/top-level/default.nix | |
| parent | 5ae7356d4292ba48ca0e3945a829adda93f64b8b (diff) | |
| download | nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar.gz nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar.bz2 nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar.lz nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar.xz nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.tar.zst nixpkgs-aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be.zip | |
Move stdenvOverrides under pkgsWithOverrides.
Diffstat (limited to 'pkgs/top-level/default.nix')
| -rw-r--r-- | pkgs/top-level/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 2d091571973..61fd39f8ca5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -97,17 +97,6 @@ let # ... pkgs.foo ..."). pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {})); - # 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 = self: pkgs: - lib.optionalAttrs (crossSystem == null && pkgs.stdenv ? overrides) - (pkgs.stdenv.overrides pkgs); - # Return the complete set of packages, after applying the overrides # returned by the `overrider' function (see above). Warning: this # function is very expensive! @@ -132,6 +121,17 @@ let aliases = self: super: import ./aliases.nix super; + # 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 = self: super: + lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) + (super.stdenv.overrides super); + customOverrides = self: super: lib.optionalAttrs (bootStdenv == null) (overrider self super); in |