diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-10 04:09:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 04:09:12 +0100 |
| commit | 47423f1598d682c26043781cdde3fb6e1d36b63c (patch) | |
| tree | 07d82465ed6c55e5f415a92fb0b90af13df62b7c | |
| parent | e0151287665f9522a417ad317c07d79731a38a4d (diff) | |
| parent | d9dacad8a3cae75a319e176ffe462983747312b4 (diff) | |
| download | nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar.gz nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar.bz2 nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar.lz nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar.xz nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.tar.zst nixlib-47423f1598d682c26043781cdde3fb6e1d36b63c.zip | |
Merge pull request #287454 from trofi/openjfx17-gcc-13-webkit-fix
openjfx17: fix `withWebKit = true` build
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/17.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index b91bde152554..58444abd3f17 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -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} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8bb1c036dcd..4068bae4a26d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |