summary refs log tree commit diff
path: root/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
diff options
context:
space:
mode:
authorBen Wolsieffer <benwolsieffer@gmail.com>2019-10-11 23:22:18 -0400
committerBen Wolsieffer <benwolsieffer@gmail.com>2019-10-11 23:37:32 -0400
commitd9d5b737ee41832a859014a74f632dd430a6f5b6 (patch)
tree99162b1e7204200fc1e191d1a19ef336b019982f /pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
parent34b4babed2898068e0bc173d27931d5e20358a61 (diff)
downloadnixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar.gz
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar.bz2
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar.lz
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar.xz
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.tar.zst
nixpkgs-d9d5b737ee41832a859014a74f632dd430a6f5b6.zip
adoptopenjdk-bin: fix JDK 8 build on ARM
Diffstat (limited to 'pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix')
-rw-r--r--pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix3
1 files changed, 2 insertions, 1 deletions
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 ];