From 6aa8a1a8ea26a95be319a29fa893c10d9ee14d8f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 16 Oct 2023 14:44:12 +0100
Subject: fix(tvix/shell): fix cargo build on MacOS

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>
---
 tvix/shell.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tvix/shell.nix')

diff --git a/tvix/shell.nix b/tvix/shell.nix
index 1a7e9ddd2b56..62b7a404bc4b 100644
--- a/tvix/shell.nix
+++ b/tvix/shell.nix
@@ -12,9 +12,6 @@
 , ...
 }:
 
-let
-  iconvDarwinDep = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
-in
 pkgs.mkShell {
   name = "tvix-rust-dev-env";
   packages = [
@@ -29,5 +26,10 @@ pkgs.mkShell {
     pkgs.rustc
     pkgs.rustfmt
     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
+  ];
 }
-- 
cgit 1.4.1