alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Move pkgsOrig outside applyGlobalOverrides and provide it as argument.

Browse source
This commit is contained in:
Nicolas B. Pierron 2016-03-17 21:03:22 +00:00
parent 5f4cb91a1c
commit f9a29887fe
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,15 +90,18 @@ let
# (un-overriden) set of packages, allowing packageOverrides # (un-overriden) set of packages, allowing packageOverrides
# attributes to refer to the original attributes (e.g. "foo = # attributes to refer to the original attributes (e.g. "foo =
# ... pkgs.foo ..."). # ... pkgs.foo ...").
pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {})); pkgs = applyGlobalOverrides pkgsInit (config.packageOverrides or (pkgs: {}));
mkOverrides = pkgsOrig: overrides: overrides // mkOverrides = pkgsOrig: overrides: overrides //
(lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig)); (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
# The un-overriden packages, passed to `overrider'.
pkgsInit = pkgsFun pkgs {};
# Return the complete set of packages, after applying the overrides # Return the complete set of packages, after applying the overrides
# returned by the `overrider' function (see above). Warning: this # returned by the `overrider' function (see above). Warning: this
# function is very expensive! # function is very expensive!
applyGlobalOverrides = overrider: applyGlobalOverrides = pkgsOrig: overrider:
let let
# Call the overrider function. We don't want stdenv overrides # Call the overrider function. We don't want stdenv overrides
# in the case of cross-building, or otherwise the basic # in the case of cross-building, or otherwise the basic
@ -106,9 +109,6 @@ let
# adapter. # adapter.
overrides = mkOverrides pkgsOrig (overrider pkgsOrig); overrides = mkOverrides pkgsOrig (overrider pkgsOrig);
# The un-overriden packages, passed to `overrider'.
pkgsOrig = pkgsFun pkgs {};
# The overriden, final packages. # The overriden, final packages.
pkgs = pkgsFun pkgs overrides; pkgs = pkgsFun pkgs overrides;
in pkgs; in pkgs;