about summary refs log tree commit diff
path: root/pkgs/applications/misc/mkgmap/default.nix
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2024-03-19 05:41:08 +0100
committerGitHub <noreply@github.com>2024-03-19 05:41:08 +0100
commit186c3e34a76f6170e01dcd41f25dee8c2c61c7f3 (patch)
tree64138e8f3524348a7eca700621966e944062eaca /pkgs/applications/misc/mkgmap/default.nix
parentced4e31b4a3a96ca7805546c1ffa03f730a356df (diff)
parente08f26cdb1e23f47821c32de2d03f8d114289bc0 (diff)
downloadnixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar.gz
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar.bz2
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar.lz
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar.xz
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.tar.zst
nixlib-186c3e34a76f6170e01dcd41f25dee8c2c61c7f3.zip
Merge pull request #296549 from TomaSajt/strip-java-archives-hook
add stripJavaArchivesHook and use treewide
Diffstat (limited to 'pkgs/applications/misc/mkgmap/default.nix')
-rw-r--r--pkgs/applications/misc/mkgmap/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix
index ee0c2043a6b4..7f97818c7452 100644
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/pkgs/applications/misc/mkgmap/default.nix
@@ -6,6 +6,7 @@
 , jre
 , ant
 , makeWrapper
+, stripJavaArchivesHook
 , doCheck ? true
 , withExamples ? false
 }:
@@ -30,10 +31,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = with deps; ''
-    # Fix the output jar timestamps for reproducibility
-    substituteInPlace build.xml \
-        --replace-fail '<jar ' '<jar modificationtime="0" '
-
     # Manually create version properties file for reproducibility
     mkdir -p build/classes
     cat > build/classes/mkgmap-version.properties << EOF
@@ -61,7 +58,7 @@ stdenv.mkDerivation rec {
     '') testInputs}
   '';
 
-  nativeBuildInputs = [ jdk ant makeWrapper ];
+  nativeBuildInputs = [ jdk ant makeWrapper stripJavaArchivesHook ];
 
   buildPhase = ''
     runHook preBuild