Unverified Commit e3cf06d6 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

rundeck-cli: replace `jdk` with `jre11_minimal_headless` (#422077)

parents 79e56adb 7c0d6e37

pkgs/by-name/ru/rundeck-cli/package.nix

+11 −7
Original line number Diff line number Diff line
@@ -2,13 +2,17 @@ 
  lib,

  stdenv,

  fetchurl,

  makeWrapper,

  jdk11,

  unzip,

  makeBinaryWrapper,

  jre11_minimal,

  jdk11_headless,

  versionCheckHook,

  nix-update-script,

}:



let

  jre11_minimal_headless = jre11_minimal.override {

    jdk = jdk11_headless;

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "rundeck-cli";

  version = "2.0.9";
@@ -18,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-c6QAgwyRCtoOlS7DEmjyK3BwHV122bilL6H+Hzrv2dQ=";

  };



  nativeBuildInputs = [ makeWrapper ];

  buildInputs = [ jdk11 ];

  nativeBuildInputs = [ makeBinaryWrapper ];

  buildInputs = [ jre11_minimal_headless ];



  dontUnpack = true;
@@ -30,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { 
    cp $src $out/share/rundeck-cli/rundeck-cli.jar



    mkdir -p $out/bin

    makeWrapper ${lib.getExe jdk11} $out/bin/rd \

    makeWrapper ${lib.getExe jre11_minimal_headless} $out/bin/rd \

      --add-flags "-jar $out/share/rundeck-cli/rundeck-cli.jar"



    runHook postInstall

pkgs/development/compilers/openjdk/jre.nix

+30 −25
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ 
  modules ? [ "java.base" ],

}:



let

  jre = stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  pname = "${jdk.pname}-minimal-jre";

  version = jdk.version;
@@ -33,12 +32,18 @@ let 
  dontInstall = true;



  passthru = {

      home = "${jre}";

    home = "${finalAttrs.finalPackage}";

    tests = {

      jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix { };

      jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix { };

    };

  };



  meta = jdk.meta // {

    description = "Minimal JRE for OpenJDK ${jdk.version}";

    longDescription = ''

      This is a minimal JRE built from OpenJDK, containing only the specified modules.

      It is suitable for running Java applications that do not require the full JDK.

    '';

  };

in

jre
 
})

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -5668,6 +5668,10 @@ with pkgs; 
  jre = jdk;

  jre_headless = jdk_headless;



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

    jdk = jdk11;

    jdkOnBuild = buildPackages.jdk11;

  };

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

    jdk = jdk17;

    jdkOnBuild = buildPackages.jdk17;