From c360696de9710f01e83d485eae8e6cb36a96db8b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 19 Mar 2024 12:42:38 +0100 Subject: [PATCH] hdfview: make deterministic --- pkgs/tools/misc/hdfview/default.nix | 11 ++++++++++- .../misc/hdfview/remove-properties-timestamp.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/hdfview/remove-properties-timestamp.patch diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 23995e65859a..b559a494d456 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -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 diff --git a/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch b/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch new file mode 100644 index 000000000000..8e3790487f2d --- /dev/null +++ b/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch @@ -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 @@ + + + ++ ++ ++ + + +