Skip to content

Commit e2d92e7

Browse files
jre_minimal: fix cross build (#394601)
2 parents d92617a + 3aa9f67 commit e2d92e7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

pkgs/development/compilers/openjdk/jre.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
stdenv,
33
jdk,
4+
jdkOnBuild, # must provide jlink
45
lib,
56
callPackage,
67
modules ? [ "java.base" ],
@@ -11,7 +12,9 @@ let
1112
pname = "${jdk.pname}-minimal-jre";
1213
version = jdk.version;
1314

15+
nativeBuildInputs = [ jdkOnBuild ];
1416
buildInputs = [ jdk ];
17+
strictDeps = true;
1518

1619
dontUnpack = true;
1720

pkgs/top-level/all-packages.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6611,11 +6611,15 @@ with pkgs;
66116611

66126612
jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {
66136613
jdk = jdk17;
6614+
jdkOnBuild = buildPackages.jdk17;
66146615
};
66156616
jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {
66166617
jdk = jdk21;
6618+
jdkOnBuild = buildPackages.jdk21;
6619+
};
6620+
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {
6621+
jdkOnBuild = buildPackages.jdk;
66176622
};
6618-
jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };
66196623

66206624
openjdk = jdk;
66216625
openjdk_headless = jdk_headless;

0 commit comments

Comments
 (0)