diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-03-04 21:55:09 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-03-04 21:55:09 +0000 |
commit | 3c99ad4dd48cd30d88b5092232f4eb215fe9953c (patch) | |
tree | d4338cf46deb3e5073178f98c8a566020ec3c106 /pkgs/development/compilers/openjdk | |
parent | e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1 (diff) | |
download | nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar.gz nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar.bz2 nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar.lz nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar.xz nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.tar.zst nixlib-3c99ad4dd48cd30d88b5092232f4eb215fe9953c.zip |
openjdk11: 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/11.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index d350c937110f..75e2d9c17148 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -6,6 +6,9 @@ , 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 @@ -25,7 +28,7 @@ let sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ gnumake44 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 |