public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline pkgsFun in pkgsWithOverrides.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 16:33:46 +00:00
parent ad31783405
commit 335a969d45
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/top-level/default.nix
View File

@ -112,18 +112,6 @@ let
# 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!
pkgsWithOverrides = overrider: 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 let
# Helper functions that are exported through `pkgs'. # Helper functions that are exported through `pkgs'.
helperFunctions = helperFunctions =
@ -140,8 +128,13 @@ let
aliases = import ./aliases.nix self; aliases = import ./aliases.nix self;
in pkgs_6 = helperFunctions // stdenvDefault // self // aliases;
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 in
pkgs pkgs