make-bootstrap-tools: add pbzx and tbd tools on x86_64-darwin

[reckenrode]

Description of changes

As part of making the 11.0 SDK stdenv bootstrap on x86_64-darwin, I need to add a couple of things that are already in the aarch64-darwin bootstrap-tools. This change adds those. This is for #180931 but separate due to needing the bootstrap-tools.cpio.bz2 to update stdenv per the script laid out in #151399.

I’ve successfully run nix-build pkgs/stdenv/darwin/make-bootstrap-tools.nix -A test on both x86_64-darwin. I also used the bootstrapped tools to build stdenvs for and the packages fixed in #180931.

Sandbox: set to relaxed.

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 22.11 Release Notes (or backporting 22.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[SuperSandro2000]

I want to express a wish for the future: make the darwin stdenv smaller.

but otherwise sounds LGTM to a none darwin person.

[toonn]

I need this for the SDK bump too so I think it's fine.
Maybe you can at least cherry pick this commit too? It adds print-reexports to the bootstrap-tools, which I needed to be able to mix and match SDK and source releases.
That way we can avoid bumping the bootstrap-tools just to add another utility.

As for moving this forward, I think we need to have the bootstrap-tools built by Hydra and then someone from the infra team needs to upload them to be hosted on nixos.org. I don't think the Hydra job I have access to builds the bootstrap-tools tarball though.

[reckenrode]

I need this for the SDK bump too so I think it's fine. Maybe you can at least cherry pick this commit too? It adds print-reexports to the bootstrap-tools, which I needed to be able to mix and match SDK and source releases. That way we can avoid bumping the bootstrap-tools just to add another utility.

This is done. I’ve cherry-picked that commit. Unfortunately, it looks like the TBD tools are still needed for the 11.0 SDK bootstrap (see my other reply for the specific error message).

[reckenrode]

I reverted the PR back to the original commit of just adding pbzx and the TBD tools.

[toonn]

LGTM

However, to actually get our new bootstrap-tools we'll have to wait a bit. My question about it in the infra channel sparked finding out the jobs that build it have been disappeared for a while. Attempt to fix it in this PR but it reverts some cross-compilation changes, which is unfortunate : /