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/applications/office | |
| parent | 3321e63b12183eadf7f9004aa0c9e79a2c471986 (diff) | |
| parent | 2d5db19dffbb7fd86c8eba10a77deb8b8838ece3 (diff) | |
| download | nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar.gz nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar.bz2 nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar.lz nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar.xz nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.tar.zst nixlib-8ee0e6664b4d07c288c8c303dcb682ff23bde432.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/jameica/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 683d51bf43f2..66d2a80c5555 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -4,6 +4,7 @@ , makeDesktopItem , makeWrapper , wrapGAppsHook +, stripJavaArchivesHook , ant , jdk , jre @@ -46,13 +47,7 @@ stdenv.mkDerivation rec { hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI="; }; - postPatch = '' - # Fix jar timestamps for reproducibility - substituteInPlace build/build.xml \ - --replace-fail '<jar ' '<jar modificationtime="0" ' - ''; - - nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; + nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper stripJavaArchivesHook ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] ++ lib.optional stdenv.isDarwin Cocoa; |