diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 16:33:46 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 16:33:46 +0000 |
| commit | 335a969d458e72a4f9049f247ea33dde8cb10630 (patch) | |
| tree | 2ee70cba14aa353544c31dbba920cfbbbb9eb062 /pkgs/top-level/default.nix | |
| parent | ad317834053983e1bf3b61f58c923ca48a0dd2d7 (diff) | |
| download | nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar.gz nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar.bz2 nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar.lz nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar.xz nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.tar.zst nixlib-335a969d458e72a4f9049f247ea33dde8cb10630.zip | |
Inline pkgsFun in pkgsWithOverrides.
Diffstat (limited to 'pkgs/top-level/default.nix')
| -rw-r--r-- | pkgs/top-level/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 39626a7485f7..135ec2a49d29 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -113,18 +113,6 @@ let # function is very expensive! pkgsWithOverrides = overrider: let - # The un-overriden packages, passed to `overrider'. - pkgs_6 = pkgsFun pkgs; - - pkgs_7 = pkgs_6 // overrider pkgs pkgs_6; - - # The overriden, final packages. - pkgs = pkgs_7 // stdenvOverrides pkgs_6; - in pkgs; - - # The package compositions. Yes, this isn't properly indented. - pkgsFun = pkgs: - let # Helper functions that are exported through `pkgs'. helperFunctions = stdenvAdapters // @@ -140,8 +128,13 @@ let aliases = import ./aliases.nix self; - in - helperFunctions // stdenvDefault // self // aliases; + pkgs_6 = helperFunctions // stdenvDefault // self // aliases; + + pkgs_7 = pkgs_6 // overrider pkgs pkgs_6; + + # The overriden, final packages. + pkgs = pkgs_7 // stdenvOverrides pkgs_6; + in pkgs; in pkgs |