ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Add extra argument to better identity with the extend function later.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 18:23:29 +00:00
parent a190baa479
commit 598ed874df
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ let
# We don't want stdenv overrides in the case of cross-building, or # We don't want stdenv overrides in the case of cross-building, or
# otherwise the basic overrided packages will not be built with the # otherwise the basic overrided packages will not be built with the
# crossStdenv adapter. # crossStdenv adapter.
stdenvOverrides = pkgs: stdenvOverrides = self: pkgs:
lib.optionalAttrs (crossSystem == null && pkgs.stdenv ? overrides) lib.optionalAttrs (crossSystem == null && pkgs.stdenv ? overrides)
(pkgs.stdenv.overrides pkgs); (pkgs.stdenv.overrides pkgs);
@ -113,33 +113,34 @@ let
# function is very expensive! # function is very expensive!
pkgsWithOverrides = overrider: pkgsWithOverrides = overrider:
let let
stdenvAdapters = stdenvAdapters = self: super:
let res = import ../stdenv/adapters.nix pkgs; in res // { let res = import ../stdenv/adapters.nix pkgs; in res // {
stdenvAdapters = res; stdenvAdapters = res;
}; };
trivialBuilders = trivialBuilders = self: super:
(import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; }); (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs;
allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; }; allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; };
allPackages = allPackages = self: super:
let res = import ./all-packages.nix allPackagesArgs res pkgs; let res = import ./all-packages.nix allPackagesArgs res pkgs;
in res; in res;
aliases = super: import ./aliases.nix super; aliases = self: super: import ./aliases.nix super;
pkgs_2 = stdenvAdapters; pkgs_1 = {};
pkgs_3 = pkgs_2 // trivialBuilders; pkgs_2 = pkgs_1 // stdenvAdapters pkgs pkgs_1;
pkgs_4 = pkgs_3 // stdenvDefault; pkgs_3 = pkgs_2 // trivialBuilders pkgs pkgs_2;
pkgs_5 = pkgs_4 // allPackages; pkgs_4 = pkgs_3 // stdenvDefault pkgs pkgs_3;
pkgs_6 = pkgs_5 // aliases pkgs_5; pkgs_5 = pkgs_4 // allPackages pkgs pkgs_4;
pkgs_6 = pkgs_5 // aliases pkgs pkgs_5;
pkgs_7 = pkgs_6 // overrider pkgs pkgs_6; pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;
# The overriden, final packages. # The overriden, final packages.
pkgs = pkgs_7 // stdenvOverrides pkgs_6; pkgs = pkgs_7 // stdenvOverrides pkgs pkgs_6;
in pkgs; in pkgs;
in in