nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 22:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

hdf4: simplify javaSupport

Browse Source 
For newer versions of JDK, the path to libawt.so does not exist. It can
be omitted and detected by CMake correctly.
This commit is contained in:
Jiajie Chen 2022-07-04 12:58:43 +08:00
parent acffa71cd1
commit 2785e3ca78
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/hdf4/default.nix
View File

@ -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"