diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/games/jpsxdec/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/ili2c/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/typesetting/fop/default.nix | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/tools/games/jpsxdec/default.nix index 85fd9d65ada1d..58876d6789695 100644 --- a/pkgs/tools/games/jpsxdec/default.nix +++ b/pkgs/tools/games/jpsxdec/default.nix @@ -7,7 +7,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { jdk8 makeWrapper copyDesktopItems - canonicalize-jars-hook + stripJavaArchivesHook ]; buildPhase = '' diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 99c1353631e90..d4ac130463770 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -5,7 +5,7 @@ , jdk8 , jre8 , makeWrapper -, canonicalize-jars-hook +, stripJavaArchivesHook }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - canonicalize-jars-hook + stripJavaArchivesHook ]; src = fetchFromGitHub { 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 |