diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 16:04:00 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 16:11:52 +0000 |
| commit | a543a57ab5758d174e6351938a73583091517273 (patch) | |
| tree | 72d9e007a82dcaba6690e417458559b5da29c874 | |
| parent | 07e549ee5b8b53ecedb8c3932982a1547d8963c6 (diff) | |
| download | nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar.gz nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar.bz2 nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar.lz nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar.xz nixpkgs-a543a57ab5758d174e6351938a73583091517273.tar.zst nixpkgs-a543a57ab5758d174e6351938a73583091517273.zip | |
Reformat pkgsWithOverrides to later facilitate the identitication with the extend functions.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11987090806..769cae55406 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -113,13 +113,13 @@ let # function is very expensive! pkgsWithOverrides = overrider: let - overrides = super: overrider pkgs super // stdenvOverrides super; - # The un-overriden packages, passed to `overrider'. - pkgs_ = pkgsFun pkgs; + pkgs_6 = pkgsFun pkgs; + + pkgs_7 = pkgs_6 // overrider pkgs pkgs_6; # The overriden, final packages. - pkgs = pkgs_ // overrides pkgs_; + pkgs = pkgs_7 // stdenvOverrides pkgs_6; in pkgs; # The package compositions. Yes, this isn't properly indented. |