Merge pull request #297160 from TomaSajt/hdfview

hdfview: make deterministic
This commit is contained in:
Pol Dellaiera 2024-03-25 11:15:23 +01:00 committed by GitHub
commit 718dae8fbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 1 deletions

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems }:
{ lib, stdenv, fetchurl, ant, jdk, hdf4, hdf5, makeDesktopItem, copyDesktopItems, strip-nondeterminism, stripJavaArchivesHook }:
stdenv.mkDerivation rec {
pname = "hdfview";
@ -14,12 +14,16 @@ stdenv.mkDerivation rec {
./0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
# Disable signing on macOS
./disable-mac-signing.patch
# Remove timestamp comment from generated versions.properties file
./remove-properties-timestamp.patch
];
nativeBuildInputs = [
ant
jdk
copyDesktopItems
strip-nondeterminism
stripJavaArchivesHook
];
HDFLIBS = (hdf4.override { javaSupport = true; }).out;
@ -64,6 +68,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
preFixup = ''
# Remove build timestamp from javadoc files
find $out/lib/app{,/mods}/doc/javadocs -name "*.html" -exec strip-nondeterminism --type javadoc {} +
'';
meta = {
description = "A visual tool for browsing and editing HDF4 and HDF5 files";
license = lib.licenses.free; # BSD-like

View File

@ -0,0 +1,14 @@
diff --git a/build.xml b/build.xml
index fcc4931..2afeb6c 100644
--- a/build.xml
+++ b/build.xml
@@ -345,6 +345,9 @@
<entry key="HDF5_VERSION" value="${hdf5.version}"/>
<entry key="HDFVIEW_VERSION" value="${app.version}"/>
</propertyfile>
+ <exec executable="sed" failonerror="true">
+ <arg line="-i /#/d ${classes.dir}/hdf/versions.properties" />
+ </exec>
</target>
<target name="compile" depends="clean, create-property-file, compileobj, compilehdf4, compilefits, compilenc2, compilehdf5">