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/development/libraries | |
| 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/development/libraries')
4 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 698a7f6a28ac..ec948f1fdccc 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -4,6 +4,7 @@ , ant , jdk8 , sharutils +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -20,16 +21,11 @@ stdenv.mkDerivation (finalAttrs: { ant jdk8 sharutils + stripJavaArchivesHook ]; sourceRoot = "${finalAttrs.src.name}/freetts-${finalAttrs.version}"; - postPatch = '' - # Fix jar timestamps for reproducibility - substituteInPlace build.xml demo.xml \ - --replace-fail '<jar ' '<jar modificationtime="0" ' - ''; - buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index 2f673a8e5a67..65df9d6cfa22 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -4,7 +4,7 @@ , ant , jdk , makeWrapper -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - canonicalize-jars-hook + stripJavaArchivesHook ]; buildPhase = '' diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 96b6cd05ed1a..8f7282df0bb2 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , ant , jdk -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ant jdk - canonicalize-jars-hook + stripJavaArchivesHook ]; buildPhase = '' diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 4c900ed21ac6..2d3f4eeb6575 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, canonicalize-jars-hook +, stripJavaArchivesHook , fetchzip , pkg-config , atk @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - canonicalize-jars-hook + stripJavaArchivesHook pkg-config ]; buildInputs = [ |