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

top-level: Inherit system and platform in stage.nix not all-packages.nix

Browse Source 
These are not packages, and so its more elegant to do this outside of
all-packages.nix.
This commit is contained in:
John Ericson 2016-12-17 23:51:18 -08:00
parent 0f33b9f7f1
commit 67ebd3161b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -5,9 +5,7 @@
* to merges. Please use the full-text search of your editor. ;) * to merges. Please use the full-text search of your editor. ;)
* Hint: ### starts category names. * Hint: ### starts category names.
*/ */
{ system, noSysDirs, config, crossSystem, platform, lib { lib, nixpkgsFun, noSysDirs, config}:
, nixpkgsFun
}:
self: pkgs: self: pkgs:
with pkgs; with pkgs;
@ -18,9 +16,6 @@ in
{ {
# Make some arguments passed to all-packages.nix available
inherit system platform;
# Allow callPackage to fill in the pkgs argument # Allow callPackage to fill in the pkgs argument
inherit pkgs; inherit pkgs;

11
pkgs/top-level/stage.nix
View File

@ -47,12 +47,15 @@ let
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir;
}; };
stdenvDefault = self: super: stdenvBootstappingAndPlatforms = self: super: {
{ stdenv = stdenv // { inherit platform; }; }; stdenv = stdenv // { inherit platform; };
inherit
system platform crossSystem;
};
allPackages = self: super: allPackages = self: super:
let res = import ./all-packages.nix let res = import ./all-packages.nix
{ inherit system noSysDirs config crossSystem platform lib nixpkgsFun; } { inherit lib nixpkgsFun noSysDirs config; }
res self; res self;
in res; in res;
@ -77,7 +80,7 @@ let
# The complete chain of package set builders, applied from top to bottom # The complete chain of package set builders, applied from top to bottom
toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [ toFix = lib.foldl' (lib.flip lib.extends) (self: {}) [
stdenvDefault stdenvBootstappingAndPlatforms
stdenvAdapters stdenvAdapters
trivialBuilders trivialBuilders
allPackages allPackages