Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Append buck2 toolchain with additional packages #1264

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Append buck2 toolchain with additional packages #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,23 +269,28 @@
createWorker = pkgs.callPackage ./tools/create-worker.nix {inherit buildImage self;};
buck2-toolchain = let
buck2-nightly-rust-version = "2024-04-28";
buck2-nightly-rust =
if pkgs.stdenv.isDarwin
then pkgs.rust-bin.nightly.${buck2-nightly-rust-version}
else pkgs.pkgsMusl.rust-bin.nightly.${buck2-nightly-rust-version};
buck2-nightly-rust = pkgs.rust-bin.nightly.${buck2-nightly-rust-version};
buck2-rust = buck2-nightly-rust.default.override {extensions = ["rust-src"];};
in
pkgs.callPackage ./tools/create-worker-experimental.nix {
inherit buildImage self;
imageName = "buck2-toolchain";
packagesForImage = [
pkgs.coreutils
pkgs.bash
pkgs.clang
pkgs.go
pkgs.diffutils
pkgs.gnutar
pkgs.gzip
buck2-nightly-rust.default
pkgs.python3Full
pkgs.unzip
pkgs.zstd
pkgs.cargo-bloat
pkgs.mold-wrapped
pkgs.reindeer
pkgs.lld_16
pkgs.clang_16
buck2-rust
];
};
siso-chromium = buildImage {
Expand Down
4 changes: 3 additions & 1 deletion tools/create-worker-experimental.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ in
(buildEnv {
name = "${imageName}-buildEnv";
paths = packagesForImage;
pathsToLink = ["/bin"];
# Explicitly flatten out the paths to link as
# laid out in the packages.
pathsToLink = "/";
})
];

Expand Down