cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

hdfview: 3.1.3 -> 3.1.4

Browse source 
Set machine.arch for aarch64 machines.
This commit is contained in:
Jiajie Chen 2022-07-11 08:36:40 +08:00
parent 561721bbb8
commit f4e3995bf6
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/misc/hdfview/default.nix
View file

@ -2,15 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hdfview"; pname = "hdfview";
version = "3.1.3"; version = "3.1.4";
src = fetchurl { src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz"; url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-VmgHSVMFoy09plU5pSnyaPz8N15toy7QfCtXI7mqDGY="; sha256 = "sha256-iY/NUifU57aX795eWpaUBflrclF/nfvb3OKZEpD9VqA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
ant jdk ant
jdk
nettools # "hostname" required nettools # "hostname" required
copyDesktopItems copyDesktopItems
]; ];
@ -18,10 +19,14 @@ stdenv.mkDerivation rec {
HDFLIBS = (hdf4.override { javaSupport = true; }).out; HDFLIBS = (hdf4.override { javaSupport = true; }).out;
HDF5LIBS = (hdf5.override { javaSupport = true; }).out; HDF5LIBS = (hdf5.override { javaSupport = true; }).out;
buildPhase = '' buildPhase =
let
arch = if stdenv.isx86_64 then "x86_64" else "aarch64";
in
''
runHook preBuild runHook preBuild
ant createJPackage ant createJPackage -Dmachine.arch=${arch}
runHook postBuild runHook postBuild
''; '';