From d9d5b737ee41832a859014a74f632dd430a6f5b6 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 11 Oct 2019 23:22:18 -0400 Subject: [PATCH] adoptopenjdk-bin: fix JDK 8 build on ARM --- pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 509050209fb..8e133347dab 100644 --- 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 ];