mirror of
https://github.com/matter-labs/teepot.git
synced 2025-07-21 15:13:56 +02:00
refactor(shells): simplify environment variable declarations
Refactored the environment variable setup by consolidating into a single `env` map for better clarity. - Removed `TEE_LD_LIBRARY_PATH` and inlined its logic directly within `LD_LIBRARY_PATH`. - Improved structure and readability of configuration-specific variables like `QCNL_CONF_PATH`. Let us run directly on x86_64: ``` ❯ cargo run --bin verify-era-proof-attestation -- \ --rpc https://mainnet.era.zksync.io \ --continuous 493220 \ --attestation-policy-file bin/verify-era-proof-attestation/examples/attestation_policy.yaml \ --tee-types sgx \ --log-level info ```
This commit is contained in:
parent
9b9acfc0c6
commit
7b1c386e14
1 changed files with 16 additions and 24 deletions
|
@ -42,31 +42,23 @@ mkShell {
|
||||||
google-cloud-sdk
|
google-cloud-sdk
|
||||||
];
|
];
|
||||||
|
|
||||||
TEE_LD_LIBRARY_PATH = lib.makeLibraryPath (
|
env = {
|
||||||
lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
|
QCNL_CONF_PATH =
|
||||||
pkgs.curl
|
if (stdenv.hostPlatform.system != "x86_64-linux") then
|
||||||
nixsgx.sgx-dcap
|
""
|
||||||
nixsgx.sgx-dcap.quote_verify
|
else
|
||||||
nixsgx.sgx-dcap.default_qpl
|
"${nixsgx.sgx-dcap.default_qpl}/etc/sgx_default_qcnl.conf";
|
||||||
]
|
OPENSSL_NO_VENDOR = "1";
|
||||||
);
|
RUST_SRC_PATH = "${toolchain_with_src}/lib/rustlib/src/rust/";
|
||||||
|
};
|
||||||
QCNL_CONF_PATH =
|
|
||||||
if (stdenv.hostPlatform.system != "x86_64-linux") then
|
|
||||||
""
|
|
||||||
else
|
|
||||||
"${nixsgx.sgx-dcap.default_qpl}/etc/sgx_default_qcnl.conf";
|
|
||||||
OPENSSL_NO_VENDOR = "1";
|
|
||||||
RUST_SRC_PATH = "${toolchain_with_src}/lib/rustlib/src/rust/library";
|
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
if [ "x$NIX_LD" = "x" ]; then
|
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${
|
||||||
export NIX_LD=$(<${stdenv.cc}/nix-support/dynamic-linker)
|
pkgs.lib.makeLibraryPath (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
|
||||||
fi
|
pkgs.curl
|
||||||
if [ "x$NIX_LD_LIBRARY_PATH" = "x" ]; then
|
nixsgx.sgx-dcap
|
||||||
export NIX_LD_LIBRARY_PATH="$TEE_LD_LIBRARY_PATH"
|
nixsgx.sgx-dcap.quote_verify
|
||||||
else
|
nixsgx.sgx-dcap.default_qpl
|
||||||
export NIX_LD_LIBRARY_PATH="$NIX_LD_LIBRARY_PATH:$TEE_LD_LIBRARY_PATH"
|
])}"
|
||||||
fi
|
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue