Merge pull request #223 from matter-labs/nix_flake_update

chore: update dependencies and enhance shell configuration
matter-labs · Nov 28, 2024 · ba7868c · ba7868c
2 parents 5b7f748 + d8239db
commit ba7868c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/shells/teepot/default.nix b/shells/teepot/default.nix
@@ -7,18 +7,36 @@
 , taplo
 , vault
 , cargo-release
+, nixsgx
+, stdenv
 }:
 mkShell {
   inputsFrom = [ teepot.teepot ];
 
-  shellHook = ''
-    export OPENSSL_NO_VENDOR="1";
-  '';
-
   packages = [
     dive
     taplo
     vault
     cargo-release
   ];
+
+  TEE_LD_LIBRARY_PATH = lib.makeLibraryPath [
+    nixsgx.sgx-dcap
+    nixsgx.sgx-dcap.quote_verify
+    nixsgx.sgx-dcap.default_qpl
+  ];
+
+  QCNL_CONF_PATH = "${nixsgx.sgx-dcap.default_qpl}/etc/sgx_default_qcnl.conf";
+  OPENSSL_NO_VENDOR = "1";
+
+  shellHook = ''
+    if [ "x$NIX_LD" = "x" ]; then
+      export NIX_LD=$(<${stdenv.cc}/nix-support/dynamic-linker)
+    fi
+    if [ "x$NIX_LD_LIBRARY_PATH" = "x" ]; then
+      export NIX_LD_LIBRARY_PATH="$TEE_LD_LIBRARY_PATH"
+    else
+      export NIX_LD_LIBRARY_PATH="$NIX_LD_LIBRARY_PATH:$TEE_LD_LIBRARY_PATH"
+    fi
+  '';
 }