diff options
| author | Jiajie Chen <c@jia.je> | 2022-07-04 12:58:43 +0800 |
|---|---|---|
| committer | Jiajie Chen <c@jia.je> | 2022-07-05 19:49:24 +0800 |
| commit | 2785e3ca786dd16136dd29753021a3144ba0f86f (patch) | |
| tree | 0143fab4077e34a72c262b9a65f0252acd15a591 /pkgs/tools/misc/hdf4 | |
| parent | acffa71cd179f4902b1575bd647d11bad1dfc867 (diff) | |
hdf4: simplify javaSupport
For newer versions of JDK, the path to libawt.so does not exist. It can be omitted and detected by CMake correctly.
Diffstat (limited to 'pkgs/tools/misc/hdf4')
| -rw-r--r-- | pkgs/tools/misc/hdf4/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 98cd0cfbdee3a..606f06d3405c3 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -12,9 +12,6 @@ , javaSupport ? false , jdk }: -let - javabase = "${jdk}/jre/lib/${jdk.architecture}"; -in stdenv.mkDerivation rec { pname = "hdf"; version = "4.2.15"; @@ -84,8 +81,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals javaSupport [ "-DHDF4_BUILD_JAVA=ON" "-DJAVA_HOME=${jdk}" - "-DJAVA_AWT_LIBRARY=${javabase}/libawt.so" - "-DJAVA_JVM_LIBRARY=${javabase}/server/libjvm.so" ] ++ lib.optionals szipSupport [ "-DHDF4_ENABLE_SZIP_ENCODING=ON" "-DHDF4_ENABLE_SZIP_SUPPORT=ON" |