From d45cdb2f3eaa508b741ff854bf6edc9f22cc4bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Feb 2021 19:04:11 +0100 Subject: [PATCH] libjpeg-turbo: Optionally build Java wrapper --- pkgs/development/libraries/libjpeg-turbo/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 2426dfebe8a..f2d4e00d1aa 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, nasm +, openjdk +, enableJava ? false # whether to build the java wrapper , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -26,11 +28,18 @@ stdenv.mkDerivation rec { moveToOutput include/transupp.h $dev_private ''; - nativeBuildInputs = [ cmake nasm ]; + nativeBuildInputs = [ + cmake + nasm + ] ++ lib.optionals enableJava [ + openjdk + ]; cmakeFlags = [ "-DENABLE_STATIC=${if enableStatic then "1" else "0"}" "-DENABLE_SHARED=${if enableShared then "1" else "0"}" + ] ++ lib.optionals enableJava [ + "-DWITH_JAVA=1" ]; doInstallCheck = true;