Skip to content

Commit

Permalink
openjdk: revert back to gnumake-4.4 as gnumake-4.4.1 breaks the build
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
trofi committed Mar 4, 2023
1 parent d78148f commit 41a6b03
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkgs/development/compilers/openjdk/19.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 41a6b03

Please sign in to comment.