chore: update dependencies and enhance shell configuration

- 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.
This commit is contained in:
Harald Hoyer 2024-11-28 15:45:39 +01:00
parent 5b7f7482e6
commit d8239dba2f
Signed by: harald
GPG key ID: F519A1143B3FBE32
2 changed files with 34 additions and 16 deletions

View file

@ -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
'';
}