From 86597bff993b1ff954f81347236d96691ee8e795 Mon Sep 17 00:00:00 2001
From: quapka
Date: Thu, 25 Jul 2024 21:13:18 +0200
Subject: Rename IPP Crypto shim

---
 flake.nix             |  2 ++
 nix/ippcpshim.nix     | 26 ++++++++++++++++++++++++++
 nix/ippcryptoshim.nix | 26 --------------------------
 3 files changed, 28 insertions(+), 26 deletions(-)
 create mode 100644 nix/ippcpshim.nix
 delete mode 100644 nix/ippcryptoshim.nix

diff --git a/flake.nix b/flake.nix
index 3ea66cf..ae43bb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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/ippcpshim.nix b/nix/ippcpshim.nix
new file mode 100644
index 0000000..43ec4d6
--- /dev/null
+++ b/nix/ippcpshim.nix
@@ -0,0 +1,26 @@
+{
+  pkgs
+  , ipp-crypto
+}:
+ with pkgs; stdenv.mkDerivation rec {
+  name = "IppCryptoShim";
+  src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
+
+  buildInputs = [
+    ipp-crypto
+    pkg-config
+    jdk11_headless
+  ];
+
+  IPP_CRYPTO_HEADER = "${ipp-crypto.dev}/include";
+  IPP_CRYPTO_LIB = "${ipp-crypto}/lib/";
+
+  buildPhase = ''
+    make ippcp
+  '';
+
+  installPhase = ''
+    mkdir --parents $out/lib
+    cp ippcp_provider.so $out/lib
+  '';
+}
diff --git a/nix/ippcryptoshim.nix b/nix/ippcryptoshim.nix
deleted file mode 100644
index b8e06f1..0000000
--- a/nix/ippcryptoshim.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  pkgs
-  , ipp-crypto
-}:
- with pkgs; stdenv.mkDerivation rec {
-  name = "IppCryptoShim";
-  src = ../standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni;
-
-  buildInputs = [
-    ipp-crypto
-    pkg-config
-    jdk11_headless
-  ];
-
-  IPP_CRYPTO_HEADER = "${ipp-crypto.dev}/include";
-  IPP_CRYPTO_LIB = "${ipp-crypto}/lib/"
-
-  buildPhase = ''
-    make ippcrypto
-  '';
-
-  installPhase = ''
-    mkdir --parents $out/lib
-    cp mbedtls_provider.so $out/lib
-  '';
-}
-- 
cgit v1.3.1