From 587cb48d7f5a1b38360ed1f3ec1782b157e93998 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 12 May 2025 21:21:03 +0200 Subject: [PATCH] jdk8: fix cross build --- pkgs/development/compilers/openjdk/generic.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 2ec03b2d5df5..f397a7c2105b 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -255,6 +255,10 @@ stdenv.mkDerivation (finalAttrs: { # Certificates generated using perl in `installPhase` perl ] + ++ lib.optionals (!atLeast11 && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # Certificates generated using keytool in `installPhase` + buildPackages.jdk8 + ] ++ [ unzip zip @@ -580,7 +584,12 @@ stdenv.mkDerivation (finalAttrs: { ( cd $jre/lib/openjdk/jre/lib/security rm cacerts - perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + perl ${./8/generate-cacerts.pl} ${ + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$jre/lib/openjdk/jre/bin/keytool" + else + "keytool" + } ${cacert}/etc/ssl/certs/ca-bundle.crt ) '' + ''