63654fbeb1
Previously we would unconditionally add Cargo.toml to the fileset. We
mostly use buildRustCrate in tvix so it does not make sense to add it by
default, instead I made it so you enable cargoSupport if you want
Cargo.{toml,lock} to be added to the fileset.
Change-Id: I5a6016534fc5599e85ab581fe3d9b81e7a24f940
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11950
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
74 lines
1.9 KiB
Nix
74 lines
1.9 KiB
Nix
{ depot, lib, pkgs, ... }:
|
|
|
|
let
|
|
wasmRust = pkgs.rust-bin.stable.latest.default.override {
|
|
targets = [ "wasm32-unknown-unknown" ];
|
|
};
|
|
|
|
cargoToml = with builtins; fromTOML (readFile ./Cargo.toml);
|
|
|
|
wasmBindgenMatch =
|
|
cargoToml.dependencies.wasm-bindgen == "= ${pkgs.wasm-bindgen-cli.version}";
|
|
|
|
assertWasmBindgen = assert (lib.assertMsg wasmBindgenMatch ''
|
|
Due to instability in the Rust WASM ecosystem, the trunk build
|
|
tool enforces that the Cargo-dependency version of `wasm-bindgen`
|
|
MUST match the version of the CLI supplied in the environment.
|
|
|
|
This can get out of sync when nixpkgs is updated. To resolve it,
|
|
wasm-bindgen must be bumped in the Cargo.toml file and cargo needs
|
|
to be run to resolve the dependencies.
|
|
|
|
Versions of `wasm-bindgen` in Cargo.toml:
|
|
|
|
Expected: '= ${pkgs.wasm-bindgen-cli.version}'
|
|
Actual: '${cargoToml.dependencies.wasm-bindgen}'
|
|
''); pkgs.wasm-bindgen-cli;
|
|
|
|
deps = [
|
|
pkgs.binaryen
|
|
pkgs.sass
|
|
pkgs.trunk
|
|
|
|
wasmRust
|
|
assertWasmBindgen
|
|
];
|
|
|
|
# Cargo.toml needs to be patched with the /nix/store source path of
|
|
# tvix-eval.
|
|
cargoTomlPatch = pkgs.writeText "tvix-eval-src.patch" ''
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 75006bec18..6ca244bbb2 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -16,7 +16,7 @@ rnix = "0.11.0"
|
|
wasm-bindgen = "= 0.2.83"
|
|
|
|
[dependencies.tvix-eval]
|
|
-path = "../../tvix/eval"
|
|
+path = "${../../tvix/eval}"
|
|
default-features = false
|
|
|
|
[dependencies.serde]
|
|
'';
|
|
in
|
|
pkgs.rustPlatform.buildRustPackage rec {
|
|
pname = "tvixbolt";
|
|
version = "canon";
|
|
src = lib.cleanSource ./.;
|
|
|
|
cargoLock.lockFile = ./Cargo.lock;
|
|
|
|
patches = [
|
|
cargoTomlPatch
|
|
];
|
|
|
|
buildPhase = ''
|
|
export PATH=${lib.makeBinPath deps}:$PATH
|
|
mkdir home
|
|
export HOME=$PWD/home
|
|
trunk build --release -d $out
|
|
'';
|
|
|
|
dontInstall = true;
|
|
}
|