From bddeacb5fa82b3d066230f08f706266b9e3d7674 Mon Sep 17 00:00:00 2001
From: quapka
Date: Tue, 23 Jul 2024 18:26:48 +0200
Subject: Don't use newer version of WolfCrypt

---
 flake.lock |  8 ++++----
 flake.nix  | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index b2ef9c5..bb646a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "custom-nixpkgs": {
       "locked": {
-        "lastModified": 1721657519,
-        "narHash": "sha256-GX9DU5wHfUsUlBNX5WZzLLj1SbawinMDPMCfwKuOKlU=",
+        "lastModified": 1721747370,
+        "narHash": "sha256-H+T7mrJ6JdnFLecs7xXwvuEM4aSUgUOc5uSvjbXoSOQ=",
         "owner": "quapka",
         "repo": "nixpkgs",
-        "rev": "951e69f7ca8f1ade27297bac8e5dc6e292d9be3b",
+        "rev": "ab32dd2547891356585d1cdb2f03f7070b1d1f89",
         "type": "github"
       },
       "original": {
         "owner": "quapka",
-        "ref": "add-ipp-crypto",
+        "ref": "customPkgs",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 8485e17..f0338b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url      = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url  = "github:numtide/flake-utils";
     gradle2nix.url   = "github:tadfisher/gradle2nix/03c1b713ad139eb6dfc8d463b5bd348368125cf1";
-    custom-nixpkgs.url = "github:quapka/nixpkgs/add-ipp-crypto"; # custom for of nixpkgs with ipp-crypto packaged
+    custom-nixpkgs.url = "github:quapka/nixpkgs/customPkgs"; # custom for of nixpkgs with ipp-crypto packaged
     # FIXME how to add submodule declaratively?
     # submodule = {
     #   url = ./
@@ -15,6 +15,14 @@
   outputs = { self, nixpkgs, custom-nixpkgs, flake-utils, gradle2nix, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
+        wolfcryptjni = with customPkgs; wolfcrypt-jni.overrideAttrs (final: prev: {
+          src = pkgs.fetchFromGitHub {
+            owner = "wolfSSL";
+            repo = "wolfcrypt-jni";
+            rev = "0497ee767c994775beda2f2091009593961e5c7e";
+            hash = "sha256-mtUXUyIKJ617WzAWjlOaMscWM7zuGBISVMEAbmQNBOg=";
+          };
+        });
         patched_boringssl = with pkgs; pkgs.boringssl.overrideAttrs (final: prev: rec {
            src = fetchgit {
             url = "https://boringssl.googlesource.com/boringssl";
@@ -124,6 +132,7 @@
                 cp ${boringsslShim.out}/lib/boringssl_provider.so standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/
                 cp ${patched_boringssl.out}/lib/lib_boringssl.a standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/
                 cp ${mbedtlsShim.out}/lib/mbedtls_provider.so standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/
+                cp ${wolfcryptjni}/lib/* standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/
                 pushd standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/
                 make lib_timing.so lib_csignals.so lib_cppsignals.so
                 popd
@@ -200,9 +209,11 @@
                 gmp
                 libgpg-error
                 libconfig
+                wolfcryptjni
               ];
 
               BORINGSSL_CFLAGS = "${patched_boringssl.dev.outPath}/include";
+              WOLFCRYPT_LIB_PATH = "${wolfcryptjni}/lib";
 
               # FIXME more things to copy here
               installPhase = ''
@@ -309,9 +320,11 @@
             gmp
             libgpg-error
             libconfig
+            wolfcryptjni
           ];
 
           BORINGSSL_CFLAGS = "${patched_boringssl.dev.outPath}/include";
+          WOLFCRYPT_LIB_PATH = "${wolfcryptjni}/lib";
 
 
         IPP_CRYPTO_HEADER = "${customPkgs.ipp-crypto.dev}/include";
-- 
cgit v1.2.3-70-g09d2