From 36cce52a784ab72e0aa15e06931621cc4f1058e8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 7 May 2021 19:03:53 +0200 Subject: [PATCH] hdf5_1_10: Add java support --- pkgs/tools/misc/hdf5/1.10.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 1a972daf6104..b8b40d83022c 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -3,6 +3,8 @@ , removeReferencesTo , zlib ? null , enableShared ? !stdenv.hostPlatform.isStatic +, javaSupport ? false +, jdk }: let inherit (lib) optional optionals; in @@ -17,11 +19,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + buildInputs = optional javaSupport jdk; + nativeBuildInputs = [ removeReferencesTo ]; propagatedBuildInputs = optional (zlib != null) zlib; - configureFlags = optional enableShared "--enable-shared"; + configureFlags = [] + ++ optional enableShared "--enable-shared" + ++ optional javaSupport "--enable-java"; patches = [ ./bin-mv.patch