diff options
| author | Florian Klink <flokli@flokli.de> | 2023-05-28T07·22+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-06-10T14·48+0000 |
| commit | 83c1546b9ad7c85dba30cb033b31e844e2401e68 (patch) | |
| tree | 8fef8bf6769b83ebc744cfa895548fb9b287a7e0 /tvix/default.nix | |
| parent | 723186c5add2807fce464dc64d9ff0204cf3d3da (diff) | |
chore(tvix/store): add fuse feature r/6261
This brings in fuse (via the `fuser` crate), and adds pkg-config and libfuse to the dev shell, so `cargo build` can link against it. Change-Id: I0d11607490e27d946bdf92b0b9e45f9ab644ba74 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8664 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/default.nix')
| -rw-r--r-- | tvix/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index ef0e2386db..c6ac875287 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -22,6 +22,11 @@ in nixpkgs = pkgs.path; defaultCrateOverrides = pkgs.defaultCrateOverrides // { + fuser = prev: { + buildInputs = prev.buildInputs or [ ] ++ [ pkgs.fuse ]; + nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; + }; + prost-build = prev: { nativeBuildInputs = protobufDep prev; }; @@ -56,6 +61,8 @@ in pkgs.cargo pkgs.clippy pkgs.evans + pkgs.fuse + pkgs.pkg-config pkgs.rust-analyzer pkgs.rustc pkgs.rustfmt @@ -72,12 +79,16 @@ in src = depot.third_party.gitignoreSource ./.; PROTO_ROOT = depot.tvix.store.protos; + buildInputs = [ + pkgs.fuse + ]; nativeBuildInputs = with pkgs; [ cargo + pkg-config + protobuf rust-analyzer - rustPlatform.cargoSetupHook rustc - protobuf + rustPlatform.cargoSetupHook ]; buildPhase = '' |