alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #176901 from alyssais/release-cross

Browse source 
release-cross.nix: fix cross bootstrap tools eval
This commit is contained in:
John Ericson 2022-06-08 13:35:29 -04:00 committed by GitHub
parent ecf2791d8b 5dfe7f928e
commit 97bdf4893d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/systems/examples.nix
View file

@ -306,8 +306,6 @@ rec {
# BSDs
amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;
x86_64-netbsd = {
config = "x86_64-unknown-netbsd";
libc = "nblibc";

13
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file

@ -1,11 +1,16 @@
{system ? builtins.currentSystem}:
let
make = crossSystem: import ./make-bootstrap-tools.nix {
localSystem = { inherit system; };
inherit crossSystem;
inherit (releaseLib) lib;
releaseLib = import ../../top-level/release-lib.nix {
# We're not using any functions from release-lib.nix that look at
# supportedSystems.
supportedSystems = [];
};
make = crossSystem: import ./make-bootstrap-tools.nix {
pkgs = releaseLib.pkgsForCross crossSystem system;
};
lib = import ../../../lib;
in lib.mapAttrs (n: make) (with lib.systems.examples; {
armv5tel = sheevaplug;
pogoplug4 = pogoplug4;