Merge pull request #296549 from TomaSajt/strip-java-archives-hook

add stripJavaArchivesHook and use treewide
This commit is contained in:
Pol Dellaiera
2024-03-19 05:41:08 +01:00
committed by GitHub
28 changed files with 89 additions and 129 deletions
@@ -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 = ''
@@ -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 = ''
@@ -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 = [