about summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2023-03-04 21:52:53 +0000
committerSergei Trofimovich <slyich@gmail.com>2023-03-04 21:52:53 +0000
commite6d4aecb9716afeeeecefc12b8ea7ac10ec856c1 (patch)
tree5b831d7dfcbead6f34480b7d9b1e25fe446b0a87 /pkgs/development/compilers/openjdk
parent41a6b03b89552caf37f4acc4bc9e5b7921d77d44 (diff)
downloadnixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar.gz
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar.bz2
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar.lz
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar.xz
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.tar.zst
nixlib-e6d4aecb9716afeeeecefc12b8ea7ac10ec856c1.zip
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.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r--pkgs/development/compilers/openjdk/17.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 4714bf11c555..c085d669971a 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.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
@@ -26,7 +29,7 @@ let
       sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc=";
     };
 
-    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