From d03e80e2537bfae06ce57b44448a2d29613e97d7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Sep 2023 22:02:49 +0200 Subject: [PATCH] buildMavenPackage: refactor --- .../apache-maven/build-package.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix index 6d990a699add..c9d0157d7b15 100644 --- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -29,28 +29,21 @@ let maven ]; - buildPhase = - if buildOffline - then '' - runHook preBuild + buildPhase = '' + runHook preBuild + '' + lib.optionalString buildOffline '' + mvn dependency:go-offline -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters} - mvn dependency:go-offline -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters} - - for artifactId in ${builtins.toString manualMvnArtifacts} - do - echo "downloading manual $artifactId" - mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2 - done - - runHook postBuild - '' - else '' - runHook preBuild - - mvn package -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters} - - runHook postBuild - ''; + for artifactId in ${builtins.toString manualMvnArtifacts} + do + echo "downloading manual $artifactId" + mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2 + done + '' + lib.optionalString (!buildOffline) '' + mvn package -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters} + '' + '' + runHook postBuild + ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = ''