Merge remote-tracking branch 'origin/staging-next' into staging

1 files changed, 8 insertions, 3 deletions

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 02eb112451b..2665330206e 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;