summary refs log tree commit diff
path: root/pkgs/stdenv/linux
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-06-08 13:23:00 +0000
committerAlyssa Ross <hi@alyssa.is>2022-06-08 17:17:10 +0000
commit5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4 (patch)
tree14d96d70fdde6261bb2cb0411328e3f83023902f /pkgs/stdenv/linux
parent74562a214ef5052e475baf29db5f92f0ae891093 (diff)
downloadnixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar.gz
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar.bz2
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar.lz
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar.xz
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.tar.zst
nixpkgs-5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4.zip
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")
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix11
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;