pyrox.dev
lol
jdk8: fix cross build
+10
-1
+10
-1
pkgs/development/compilers/openjdk/generic.nix
+10
-1
pkgs/development/compilers/openjdk/generic.nix
···
255
255
# Certificates generated using perl in `installPhase`
256
256
perl
257
257
]
258
+
++ lib.optionals (!atLeast11 && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
259
+
# Certificates generated using keytool in `installPhase`
260
+
buildPackages.jdk8
261
+
]
258
262
++ [
259
263
unzip
260
264
zip
···
580
584
(
581
585
cd $jre/lib/openjdk/jre/lib/security
582
586
rm cacerts
583
-
perl ${./8/generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
587
+
perl ${./8/generate-cacerts.pl} ${
588
+
if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
589
+
"$jre/lib/openjdk/jre/bin/keytool"
590
+
else
591
+
"keytool"
592
+
} ${cacert}/etc/ssl/certs/ca-bundle.crt
584
593
)
585
594
''
586
595
+ ''