diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-19 06:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 06:01:12 +0000 |
| commit | 8ee0e6664b4d07c288c8c303dcb682ff23bde432 (patch) | |
| tree | 7765f9763ff6cd24d17f884585c95d048e215faf /pkgs/tools/typesetting | |
| parent | 3321e63b12183eadf7f9004aa0c9e79a2c471986 (diff) | |
| parent | 2d5db19dffbb7fd86c8eba10a77deb8b8838ece3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/fop/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index e31ea73f00961..94a24211f9a39 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -5,6 +5,7 @@ , jdk , jre , makeWrapper +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -16,16 +17,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc="; }; - postPatch = '' - # Fix jar timestamps for reproducibility - substituteInPlace fop/build.xml \ - --replace-fail '<jar ' '<jar modificationtime="0" ' - ''; - nativeBuildInputs = [ ant jdk makeWrapper + stripJavaArchivesHook ]; # Note: not sure if this is needed anymore |