cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Add an extra argument to the overrider function of applyGlobalOverrides.

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

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

@ -90,7 +90,7 @@ 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 pkgsInit (config.packageOverrides or (pkgs: {})); pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {}));
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));
@ -107,7 +107,7 @@ let
# in the case of cross-building, or otherwise the basic # in the case of cross-building, or otherwise the basic
# overrided packages will not be built with the crossStdenv # overrided packages will not be built with the crossStdenv
# adapter. # adapter.
overrides = mkOverrides pkgsOrig (overrider pkgsOrig); overrides = mkOverrides pkgsOrig (overrider pkgs pkgsOrig);
# The overriden, final packages. # The overriden, final packages.
pkgs = pkgsFun pkgs overrides; pkgs = pkgsFun pkgs overrides;