diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-03-04 21:48:54 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-03-04 21:48:54 +0000 |
| commit | 41a6b03b89552caf37f4acc4bc9e5b7921d77d44 (patch) | |
| tree | c103c89211a377db3ab271aa6688637d72f911e7 /pkgs/development/compilers/openjdk | |
| parent | d78148fb3944aca23adc5e72c782384ce9208f15 (diff) | |
| download | nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar.gz nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar.bz2 nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar.lz nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar.xz nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.tar.zst nixlib-41a6b03b89552caf37f4acc4bc9e5b7921d77d44.zip | |
openjdk: 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.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/19.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix index 41a630425e98..1ac3796cf9bb 100644 --- a/pkgs/development/compilers/openjdk/19.nix +++ b/pkgs/development/compilers/openjdk/19.nix @@ -9,6 +9,9 @@ , 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 @@ -29,7 +32,7 @@ let hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ gnumake44 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 |