Unverified Commit 241ced5a authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

libreoffice: build with jdk21 (#359040)

parents 9cd16e9b 31fa0731

pkgs/applications/office/libreoffice/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 
, which

, icu

, boost

, jdk17

, jdk21

, ant

, cups

, xorg

, fontforge

, jre17_minimal

, jre21_minimal

, openssl

, gperf

, cppunit
@@ -177,7 +177,7 @@ let 
    ];

  };



  jre' = jre17_minimal.override {

  jre' = jre21_minimal.override {

    modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ];

  };
@@ -298,7 +298,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    bison

    fontforge

    gdb

    jdk17

    jdk21

    libtool

    pkg-config

  ];

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -6597,6 +6597,9 @@ with pkgs; 
  jre17_minimal = callPackage ../development/compilers/openjdk/jre.nix {

    jdk = jdk17;

  };

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

    jdk = jdk21;

  };

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















  openjdk = jdk;