diff options
| author | quapka | 2024-07-25 21:13:18 +0200 |
|---|---|---|
| committer | quapka | 2024-07-25 21:13:18 +0200 |
| commit | 86597bff993b1ff954f81347236d96691ee8e795 (patch) | |
| tree | eae8b539504ea5ff12605fe0820e403ae9ab7306 | |
| parent | dd5e280b30bf0330f7723c8a2aea397b3a7758d2 (diff) | |
| download | ECTester-86597bff993b1ff954f81347236d96691ee8e795.tar.gz ECTester-86597bff993b1ff954f81347236d96691ee8e795.tar.zst ECTester-86597bff993b1ff954f81347236d96691ee8e795.zip | |
Rename IPP Crypto shim
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | nix/ippcpshim.nix (renamed from nix/ippcryptoshim.nix) | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -125,6 +125,7 @@ gcryptShim = import ./nix/gcryptshim.nix { inherit pkgs libgcrypt libgpg-error; }; mbedtlsShim = import ./nix/mbedtlsshim.nix { pkgs = pkgs; }; ippcryptoShim = import ./nix/ippcryptoshim.nix { pkgs = pkgs; ipp-crypto = customPkgs.ipp-crypto; }; + ippcpShim = import ./nix/ippcpshim.nix { pkgs = pkgs; ipp-crypto = customPkgs.ipp-crypto; }; overlays = []; pkgs = import nixpkgs { @@ -159,6 +160,7 @@ cp ${gcryptShim.out}/lib/gcrypt_provider.so ${jniLibsPath} cp ${libresslShim.out}/lib/libressl_provider.so ${jniLibsPath} cp ${mbedtlsShim.out}/lib/mbedtls_provider.so ${jniLibsPath} + cp ${ippcpShim.out}/lib/ippcp_provider.so ${jniLibsPath} cp ${wolfcryptjni}/lib/* ${jniLibsPath} cp ${commonLibs}/lib/* ${jniLibsPath} ''; diff --git a/nix/ippcryptoshim.nix b/nix/ippcpshim.nix index b8e06f1..43ec4d6 100644 --- a/nix/ippcryptoshim.nix +++ b/nix/ippcpshim.nix @@ -13,14 +13,14 @@ ]; IPP_CRYPTO_HEADER = "${ipp-crypto.dev}/include"; - IPP_CRYPTO_LIB = "${ipp-crypto}/lib/" + IPP_CRYPTO_LIB = "${ipp-crypto}/lib/"; buildPhase = '' - make ippcrypto + make ippcp ''; installPhase = '' mkdir --parents $out/lib - cp mbedtls_provider.so $out/lib + cp ippcp_provider.so $out/lib ''; } |
