diff options
| -rw-r--r-- | lib/systems/examples.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index e41290864ed19..b26407117c852 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -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"; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 02eb112451bd4..2665330206e1c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,11 +1,16 @@ {system ? builtins.currentSystem}: let + 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 { - localSystem = { inherit system; }; - inherit crossSystem; + pkgs = releaseLib.pkgsForCross crossSystem system; }; - lib = import ../../../lib; in lib.mapAttrs (n: make) (with lib.systems.examples; { armv5tel = sheevaplug; pogoplug4 = pogoplug4; |