mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/shell): fix cargo build on MacOS

Browse source 
It looks like we need Security Framework in the shell to be able to
imperatively run `cargo build`.

Change-Id: Ia5df9052bafca3610d4ed235b180b812d33d0d15
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9756
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-10-16 14:44:12 +01:00 committed by clbot
parent 652afd21b3
commit 6aa8a1a8ea
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tvix/shell.nix
View file

@ -12,9 +12,6 @@
, ... , ...
}: }:
let
iconvDarwinDep = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
in
pkgs.mkShell { pkgs.mkShell {
name = "tvix-rust-dev-env"; name = "tvix-rust-dev-env";
packages = [ packages = [
@ -29,5 +26,10 @@ pkgs.mkShell {
pkgs.rustc pkgs.rustc
pkgs.rustfmt pkgs.rustfmt
pkgs.protobuf pkgs.protobuf
] ++ iconvDarwinDep; ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
# We need these two dependencies in the ambient environment to be able to
# `cargo build` on MacOS.
pkgs.libiconv
pkgs.buildPackages.darwin.apple_sdk.frameworks.Security
];
} }