diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-03-12 12:05:46 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-03-12 12:25:45 +0000 |
commit | 544ef3138a7f383a260f421eb7999dd917a0c414 (patch) | |
tree | 860489c4ba6a313cbc31cbb0edfb88f697334ecd /pkgs/development/compilers/openjdk | |
parent | 6ab299b3a36c656065d92cab3385a29e43404879 (diff) |
openjdk: port to gnumake-4.4.1
Revert e6d4aecb97 "revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build" and aply the fix from https://github.com/openjdk/jdk/pull/12992
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/17.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index c085d669971a3..2eac6e33116af 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio , file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib , libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst , libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap @@ -6,9 +6,6 @@ , headless ? false , enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -# Hold back make-4.4 as 4.4.1 breaks the build: -# https://github.com/NixOS/nixpkgs/issues/219513 -, gnumake44 }: let @@ -29,7 +26,7 @@ let sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; }; - nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ]; + nativeBuildInputs = [ pkg-config autoconf unzip ]; buildInputs = [ cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst @@ -61,6 +58,14 @@ let url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c"; sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo="; }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; |