Unify the applyGlobalOverride function with the overridePackages function.

This commit is contained in:
Nicolas B. Pierron 2016-03-17 21:07:13 +00:00
parent a6e260c91f
commit a5188bda7b

View File

@ -158,11 +158,7 @@ let
# #
# The result is `pkgs' where all the derivations depending on `foo' # The result is `pkgs' where all the derivations depending on `foo'
# will use the new version. # will use the new version.
overridePackages = f: overridePackages = f: applyGlobalOverrides pkgs f;
let
newpkgs = pkgsFun newpkgs overrides;
overrides = mkOverrides pkgs (f newpkgs pkgs);
in newpkgs;
# Override system. This is useful to build i686 packages on x86_64-linux. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: kernel: (import ./../..) { forceSystem = system: kernel: (import ./../..) {