From 5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Jun 2022 13:23:00 +0000 Subject: release-cross.nix: fix cross bootstrap tools eval In 5643714dea5, I changed pkgs/stdenv/linux/make-bootstrap-tools.nix to take a package set instead of system and localSystem arguments, but I forgot to update make-bootstrap-tools-cross.nix. Fixes: 5643714dea5 ("stdenvBootstrapTools: inherit {cross,local}System") --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/stdenv/linux') 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; -- cgit 1.4.1