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

top-level: add extraPkgs to stage.nix

Browse Source
This commit is contained in:
Matthew Bauer 2018-06-25 14:22:51 -04:00
parent d665e80450
commit b6b1950594
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,11 +117,17 @@ let
lib.optionalAttrs allowCustomOverrides lib.optionalAttrs allowCustomOverrides
((config.packageOverrides or (super: {})) super); ((config.packageOverrides or (super: {})) super);
# Convenient way to reference cross # Convenience attributes for instantitating nixpkgs. Each of these
# Used in aliases for now but should not be used in Nixpkgs. # will instantiate a new version of allPackages. They map example
cross = self: super: { pkgsCross = lib.mapAttrs (n: crossSystem: # attributes to their own thing.
nixpkgsFun { inherit crossSystem; }) extraPkgs = self: super: {
lib.systems.examples; }; pkgsCross = lib.mapAttrs (n: crossSystem:
nixpkgsFun { inherit crossSystem; })
lib.systems.examples;
pkgsLocal = lib.mapAttrs (n: localSystem:
nixpkgsFun { inherit localSystem; })
lib.systems.examples;
};
# The complete chain of package set builders, applied from top to bottom. # The complete chain of package set builders, applied from top to bottom.
# stdenvOverlays must be last as it brings package forward from the # stdenvOverlays must be last as it brings package forward from the
@ -133,7 +139,7 @@ let
trivialBuilders trivialBuilders
splice splice
allPackages allPackages
cross extraPkgs
aliases aliases
configOverrides configOverrides
] ++ overlays ++ [ ] ++ overlays ++ [