lol

jre_minimal: fix cross build

+8 -1
+3
pkgs/development/compilers/openjdk/jre.nix
··· 1 { 2 stdenv, 3 jdk, 4 lib, 5 callPackage, 6 modules ? [ "java.base" ], ··· 11 pname = "${jdk.pname}-minimal-jre"; 12 version = jdk.version; 13 14 buildInputs = [ jdk ]; 15 16 dontUnpack = true; 17
··· 1 { 2 stdenv, 3 jdk, 4 + jdkOnBuild, # must provide jlink 5 lib, 6 callPackage, 7 modules ? [ "java.base" ], ··· 12 pname = "${jdk.pname}-minimal-jre"; 13 version = jdk.version; 14 15 + nativeBuildInputs = [ jdkOnBuild ]; 16 buildInputs = [ jdk ]; 17 + strictDeps = true; 18 19 dontUnpack = true; 20
+5 -1
pkgs/top-level/all-packages.nix
··· 6613 6614 jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { 6615 jdk = jdk17; 6616 }; 6617 jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix { 6618 jdk = jdk21; 6619 }; 6620 - jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; 6621 6622 openjdk = jdk; 6623 openjdk_headless = jdk_headless;
··· 6613 6614 jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix { 6615 jdk = jdk17; 6616 + jdkOnBuild = buildPackages.jdk17; 6617 }; 6618 jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix { 6619 jdk = jdk21; 6620 + jdkOnBuild = buildPackages.jdk21; 6621 }; 6622 + jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { 6623 + jdkOnBuild = buildPackages.jdk; 6624 + }; 6625 6626 openjdk = jdk; 6627 openjdk_headless = jdk_headless;