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

top-level: move cross pkgs to overlay

Browse Source
This commit is contained in:
Matthew Bauer 2018-06-25 14:18:51 -04:00
parent eb90f5c08e
commit d665e80450
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,6 @@ with pkgs;
then pkgsi686Linux.callPackage then pkgsi686Linux.callPackage
else throw "callPackage_i686 not supported on system '${stdenv.system}'"; else throw "callPackage_i686 not supported on system '${stdenv.system}'";
# Useful attribute of systems to cross compile to.
pkgsCross = lib.mapAttrs (n: crossSystem:
nixpkgsFun { inherit crossSystem; })
lib.systems.examples;
# A stdenv capable of building 32-bit binaries. On x86_64-linux, # A stdenv capable of building 32-bit binaries. On x86_64-linux,
# it uses GCC compiled with multilib support; on i686-linux, it's # it uses GCC compiled with multilib support; on i686-linux, it's
# just the plain stdenv. # just the plain stdenv.

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

@ -117,6 +117,12 @@ let
lib.optionalAttrs allowCustomOverrides lib.optionalAttrs allowCustomOverrides
((config.packageOverrides or (super: {})) super); ((config.packageOverrides or (super: {})) super);
# Convenient way to reference cross
# Used in aliases for now but should not be used in Nixpkgs.
cross = self: super: { pkgsCross = lib.mapAttrs (n: crossSystem:
nixpkgsFun { inherit crossSystem; })
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
# previous bootstrapping phases which have already been overlayed. # previous bootstrapping phases which have already been overlayed.
@ -127,6 +133,7 @@ let
trivialBuilders trivialBuilders
splice splice
allPackages allPackages
cross
aliases aliases
configOverrides configOverrides
] ++ overlays ++ [ ] ++ overlays ++ [