diff options
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | nix/boringsslshim.nix | 2 | ||||
| -rw-r--r-- | nix/botanshim.nix | 5 | ||||
| -rw-r--r-- | nix/cryptoppshim.nix | 2 | ||||
| -rw-r--r-- | nix/ippcpshim.nix | 2 | ||||
| -rw-r--r-- | nix/libresslshim.nix | 2 | ||||
| -rw-r--r-- | nix/mbedtlsshim.nix | 2 | ||||
| -rw-r--r-- | nix/nettleshim.nix | 2 | ||||
| -rw-r--r-- | nix/opensslshim.nix | 2 | ||||
| -rw-r--r-- | nix/tomcryptshim.nix | 2 |
10 files changed, 13 insertions, 13 deletions
@@ -634,6 +634,7 @@ pname = "ECTesterStandalone"; version = "0.3.3"; lockFile = ./gradle.lock; + buildJdk = pkgs.jdk; # NOTE: the shims are built separately, therefore no need to call build `libs` target gradleBuildFlags = [ ":standalone:uberJar" ]; @@ -676,8 +677,8 @@ postFixup = '' makeWrapper \ - ${jdk17_headless}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/build/libs/${pname}.jar" \ + ${jdk}/bin/java $out/bin/${pname} \ + --add-flags "-Dstdout.encoding=UTF8 -Dstderr.encoding=UTF8 -jar $out/build/libs/${pname}.jar" \ --set LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$LD_LIBRARY_PATH ''; diff --git a/nix/boringsslshim.nix b/nix/boringsslshim.nix index a32a5bc..4fb8a02 100644 --- a/nix/boringsslshim.nix +++ b/nix/boringsslshim.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ boringssl pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/botanshim.nix b/nix/botanshim.nix index ce16b1b..eb74a6b 100644 --- a/nix/botanshim.nix +++ b/nix/botanshim.nix @@ -2,8 +2,7 @@ stdenv, botan2, pkg-config, - # NOTE change to jdk17? - jdk11_headless, + jdk, }: stdenv.mkDerivation { name = "BotanShim"; @@ -12,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ botan2 pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/cryptoppshim.nix b/nix/cryptoppshim.nix index 2989066..c225e8c 100644 --- a/nix/cryptoppshim.nix +++ b/nix/cryptoppshim.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ cryptopp pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/ippcpshim.nix b/nix/ippcpshim.nix index a059d5b..465c3c2 100644 --- a/nix/ippcpshim.nix +++ b/nix/ippcpshim.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ ipp-crypto pkg-config - jdk11_headless + jdk ]; IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include -DECTESTER_IPPCP_VERSION=${ipp-crypto.version}"; diff --git a/nix/libresslshim.nix b/nix/libresslshim.nix index 862701f..100e941 100644 --- a/nix/libresslshim.nix +++ b/nix/libresslshim.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ libressl pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/mbedtlsshim.nix b/nix/mbedtlsshim.nix index 05cad9c..0b31907 100644 --- a/nix/mbedtlsshim.nix +++ b/nix/mbedtlsshim.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ mbedtls pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/nettleshim.nix b/nix/nettleshim.nix index 7488398..42da7ff 100644 --- a/nix/nettleshim.nix +++ b/nix/nettleshim.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nettle gmp pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/opensslshim.nix b/nix/opensslshim.nix index be0263b..7c585fc 100644 --- a/nix/opensslshim.nix +++ b/nix/opensslshim.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [ openssl pkg-config - jdk11_headless + jdk ]; buildPhase = '' diff --git a/nix/tomcryptshim.nix b/nix/tomcryptshim.nix index bcdc984..d4f1f2f 100644 --- a/nix/tomcryptshim.nix +++ b/nix/tomcryptshim.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { libtommath libtomcrypt pkg-config - jdk11_headless + jdk ]; buildPhase = '' |