about summary refs log tree commit diff
path: root/pkgs/stdenv/darwin
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-10-07 15:48:15 +0000
committerAlyssa Ross <hi@alyssa.is>2023-10-07 19:38:01 +0000
commit1da4b5c99e4a8b85531d38922ce658cef1d7cfcc (patch)
treee03e2eb3344cbbc970ccd20f4bdaa21a81f8ccf4 /pkgs/stdenv/darwin
parent4e70375637076e9b4f67f0450b1d86b88b81bc11 (diff)
downloadnixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar.gz
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar.bz2
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar.lz
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar.xz
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.tar.zst
nixlib-1da4b5c99e4a8b85531d38922ce658cef1d7cfcc.zip
release.nix: namespace bootstrap tools with triples
This will allow buliding bootstrap tools for platforms with
non-default libcs, like *-unknown-linux-musl.

This gets rid of limitedSupportSystems/systemsWithAnySupport.  There
was no need to use systemsWithAnySupport for supportDarwin, because it
was always equivalent to supportedSystems for that purpose, and the
only other way it was used was for determining which platforms to
build the bootstrap tools for, so we might as well use a more explicit
parameter for that, and then we can change how it works without
affecting the rest of the Hydra jobs.

Not affecting the rest of the Hydra jobs is important, because if we
changed all jobs to use config triples, we'd end up renaming every
Hydra job.  That might still be worth thinking about at some point,
but it's unnecessary at this point (and would be a lot of work).

I've checked by running

    nix-eval-jobs --force-recurse pkgs/top-level/release.nix

that the actual bootstrap tools derivations are unaffected by this
change, and that the only other jobs that change are ones that depend
on the hash of all of Nixpkgs.  Of the other jobset entrypoints that
end up importing pkgs/top-level/release.nix, none used the
limitedSupportedSystems parameter, so they should all be unaffected as
well.
Diffstat (limited to 'pkgs/stdenv/darwin')
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 46ba25f8603b..448d6ecd9f17 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -211,7 +211,7 @@ in rec {
   };
 
   bootstrapTools = derivation {
-    inherit (localSystem) system;
+    inherit (stdenv.hostPlatform) system;
 
     name = "bootstrap-tools";
     builder = "${bootstrapFiles.tools}/bin/bash";