Merge pull request #17241 from rasendubi/antBuild

antBuild: run default hooks
This commit is contained in:
Joachim F 2016-07-26 23:01:09 +02:00 committed by GitHub
commit b52648cc9c

View File

@ -41,6 +41,8 @@ stdenv.mkDerivation (
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/share/java mkdir -p $out/share/java
${ if jars == [] then '' ${ if jars == [] then ''
find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
@ -53,6 +55,8 @@ stdenv.mkDerivation (
canonicalizeJar $j canonicalizeJar $j
echo file jar $j >> $out/nix-support/hydra-build-products echo file jar $j >> $out/nix-support/hydra-build-products
done done
runHook postInstall
''; '';
generateWrappersPhase = generateWrappersPhase =
@ -75,7 +79,9 @@ stdenv.mkDerivation (
closeNest closeNest
''; '';
buildPhase = if antTargets == [] then '' buildPhase = ''
runHook preBuild
'' + (if antTargets == [] then ''
header "Building default ant target" header "Building default ant target"
ant ${antFlags} ant ${antFlags}
closeNest closeNest
@ -83,7 +89,9 @@ stdenv.mkDerivation (
header "Building '${t}' target" header "Building '${t}' target"
ant ${antFlags} ${t} ant ${antFlags} ${t}
closeNest closeNest
'') antTargets; '') antTargets) + ''
runHook postBuild
'';
finalPhase = finalPhase =
'' ''