adoptopenjdk-bin: fix JDK 8 build on ARM

2019-10-11 23:22:18 -04:00 · 2019-10-11 23:22:18 -04:00 · d9d5b737ee
commit d9d5b737ee
parent 34b4babed2
1 changed files with 2 additions and 1 deletions
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@ -9,6 +9,7 @@ sourcePerArch:
 , fontconfig
 , zlib
 , xorg
+, libffi
 }:

 let
@ -29,7 +30,7 @@ let result = stdenv.mkDerivation rec {
  buildInputs = [
    alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
    xorg.libXi xorg.libXrender
-  ];
+  ] ++ lib.optional stdenv.isAarch32 libffi;

  nativeBuildInputs = [ autoPatchelfHook ];