diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-03-12 11:24:11 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-03-12 12:25:45 +0000 |
| commit | 6ab299b3a36c656065d92cab3385a29e43404879 (patch) | |
| tree | 7e42ef6d0fba1407617a29efd39116280cfff59e /pkgs/development/compilers/openjdk/19.nix | |
| parent | 249da6de9c1afa6a31b09e3d1dcfc14d8cf0aad6 (diff) | |
| download | nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar.gz nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar.bz2 nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar.lz nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar.xz nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.tar.zst nixpkgs-6ab299b3a36c656065d92cab3385a29e43404879.zip | |
openjdk: port to gnumake-4.4.1
Revert 41a6b03b89552c "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/19.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/19.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 1ac3796cf9b..903155cfcc5 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -9,9 +9,6 @@ , headless ? stdenv.targetPlatform.isGhcjs , 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 @@ -32,7 +29,7 @@ let hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; }; - nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; buildInputs = [ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst @@ -63,6 +60,14 @@ let url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560"; hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k="; }) + + # 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 ]; |