Bump to latest JDK in Nix, also fix unicode output issue.

crocs-muni · Aug 17, 2024 · e6af4bb · e6af4bb
1 parent 3b9ad72
commit e6af4bb
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/flake.nix b/flake.nix
@@ -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
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   buildInputs = [
     boringssl
     pkg-config
-    jdk11_headless
+    jdk
   ];
 
   buildPhase = ''

diff --git 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
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [
     cryptopp
     pkg-config
-    jdk11_headless
+    jdk
   ];
 
   buildPhase = ''

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   buildInputs = [
     openssl
     pkg-config
-    jdk11_headless
+    jdk
   ];
 
   buildPhase = ''

diff --git a/nix/tomcryptshim.nix b/nix/tomcryptshim.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     libtommath
     libtomcrypt
     pkg-config
-    jdk11_headless
+    jdk
   ];
 
   buildPhase = ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { @@
         nettle
         gmp
         pkg-config
-        jdk11_headless
+        jdk
       ];
       buildPhase = ''
@@ Expand Down @@