Unverified Commit e2d92e73 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

jre_minimal: fix cross build (#394601)

parents d92617a8 3aa9f671

pkgs/development/compilers/openjdk/jre.nix

+3 −0
Original line number Diff line number Diff line 
{

  stdenv,

  jdk,

  jdkOnBuild, # must provide jlink

  lib,

  callPackage,

  modules ? [ "java.base" ],
@@ -11,7 +12,9 @@ let 
    pname = "${jdk.pname}-minimal-jre";

    version = jdk.version;



    nativeBuildInputs = [ jdkOnBuild ];

    buildInputs = [ jdk ];

    strictDeps = true;



    dontUnpack = true;

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -6611,11 +6611,15 @@ with pkgs; 














  jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {















    jdk = jdk17;













    jdkOnBuild = buildPackages.jdk17;















  };















  jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {















    jdk = jdk21;













    jdkOnBuild = buildPackages.jdk21;













  };













  jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {













    jdkOnBuild = buildPackages.jdk;















  };













  jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { };





























  openjdk = jdk;















  openjdk_headless = jdk_headless;