openjdk11: 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
This commit is contained in:
parent
544ef3138a
commit
7b53fc5241
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
{ stdenv, lib, 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, openjdk11-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
|
||||
|
@ -28,7 +25,7 @@ let
|
|||
sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4=";
|
||||
};
|
||||
|
||||
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
|
||||
|
@ -43,6 +40,14 @@ let
|
|||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap.patch
|
||||
./fix-library-path-jdk11.patch
|
||||
|
||||
# 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-jdk10.patch
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue