openjdk17: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build
Without the change `openjdk` build fails on `staging-next` as:
> installing
> mv: missing destination file operand after '/nix/store/pwgvafi1xwa6l0dygmcyr1sl27dhpy67-openjdk-19.0.2+7/lib/openjdk'
> Try 'mv --help' for more information.
This commit is contained in:
@@ -6,6 +6,9 @@
|
|||||||
, headless ? false
|
, headless ? false
|
||||||
, enableJavaFX ? false, openjfx
|
, enableJavaFX ? false, openjfx
|
||||||
, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
|
, 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
|
let
|
||||||
@@ -26,7 +29,7 @@ let
|
|||||||
sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc=";
|
sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
nativeBuildInputs = [ gnumake44 pkg-config autoconf unzip ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
|
||||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||||
|
|||||||
Reference in New Issue
Block a user