diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-25 14:18:51 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-02 11:07:53 -0400 |
commit | d665e80450efcfeed9b245aecb6218cb82e1a24c (patch) | |
tree | 73bce379c11eb49d76680e943443a6988b1c6a22 | |
parent | eb90f5c08e3741c42655b250c19fcd0243a472b1 (diff) | |
download | nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar.gz nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar.bz2 nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar.lz nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar.xz nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.tar.zst nixpkgs-d665e80450efcfeed9b245aecb6218cb82e1a24c.zip |
top-level: move cross pkgs to overlay
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86b5ee6a8b0..d3d40662053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31,11 +31,6 @@ with pkgs; then pkgsi686Linux.callPackage 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, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f9941a1c500..ecb3541cbb3 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -117,6 +117,12 @@ let lib.optionalAttrs allowCustomOverrides ((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. # stdenvOverlays must be last as it brings package forward from the # previous bootstrapping phases which have already been overlayed. @@ -127,6 +133,7 @@ let trivialBuilders splice allPackages + cross aliases configOverrides ] ++ overlays ++ [ |