Skip to content

Commit

Permalink
chore: update dependencies and enhance shell configuration
Browse files Browse the repository at this point in the history
- Updated multiple dependencies in flake.lock to their latest revisions.
- Improved the shell configuration in the teepot with enhanced environment variable settings for SGX support.
- Reinstated OPENSSL_NO_VENDOR and added library paths to ensure compatibility and proper linking.
  • Loading branch information
haraldh committed Nov 28, 2024
1 parent 5b7f748 commit d8239db
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 16 deletions.
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 22 additions & 4 deletions shells/teepot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';
}

0 comments on commit d8239db

Please sign in to comment.