Unverified Commit 47423f15 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #287454 from trofi/openjfx17-gcc-13-webkit-fix 

openjfx17: fix `withWebKit  = true` build
parents e0151287 d9dacad8

pkgs/development/compilers/openjdk/openjfx/17.nix

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ let 


    dontUseCmakeConfigure = true;



    postPatch = ''

      # Add missing includes for gcc-13 for webkit build:

      sed -e '1i #include <cstdio>' \

        -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \

           modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h

    '';



    config = writeText "gradle.properties" (''

      CONF = Release

      JDK_HOME = ${openjdk17_headless.home}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -16367,7 +16367,7 @@ with pkgs; 
  hugs = callPackage ../development/interpreters/hugs { };















  inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21;













  openjfx = pin-to-gcc12-if-gcc13 (openjfx17.override { });













  openjfx = openjfx17;





























  openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;















  openjdk8 = javaPackages.compiler.openjdk8;