diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 7b78a8a9a4b3..2570406a7112 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchpatch -, fetchzip , autoconf , automake , binutils @@ -13,10 +12,9 @@ , git , libtool , linkFarmFromDrvs -, nasm , ocaml , ocamlPackages -, openssl_1_1 +, openssl , perl , python3 , texinfo @@ -106,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool - openssl_1_1 + openssl ]; BINUTILS_DIR = "${binutils}/bin"; diff --git a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix index 968a36455562..5a4c941a22b9 100644 --- a/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix +++ b/pkgs/os-specific/linux/sgx/sdk/ipp-crypto.nix @@ -2,19 +2,19 @@ , fetchFromGitHub , cmake , nasm -, openssl_1_1 +, openssl , python3 , extraCmakeFlags ? [ ] }: gcc11Stdenv.mkDerivation rec { pname = "ipp-crypto"; - version = "2021.7"; + version = "2021.9.0"; src = fetchFromGitHub { owner = "intel"; repo = "ipp-crypto"; rev = "ippcp_${version}"; - hash = "sha256-3W0LlJgmrp2Rk7xQ+0GQfkF2UpH4htx9R7IL86smtnY="; + hash = "sha256-+ITnxyrkDQp4xRa+PVzXdYsSkI5sMNwQGfGU+lFJ6co="; }; cmakeFlags = [ "-DARCH=intel64" ] ++ extraCmakeFlags; @@ -22,9 +22,7 @@ gcc11Stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm - # TODO(phlip9): The most recent `ipp-crypto` version (2021.9) now uses - # OpenSSL v3 so we can avoid this EOL version when sgx-sdk updates. - openssl_1_1 + openssl python3 ]; }