From 52fb36e7e05ffbd8f517f4b9d51c81a7ddb063b9 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 3 Aug 2015 20:53:30 +0300 Subject: [PATCH] maven: move to dedicated directory to prevent clashes with other java applications --- .../tools/build-managers/apache-maven/builder.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index 03e4a041402..8d06352b135 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -2,16 +2,16 @@ source $stdenv/setup unpackPhase -mkdir -p $out -cp -r $name/* $out +mkdir -p $out/maven +cp -r $name/* $out/maven -wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk" +makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk" # Add the maven-axis and JIRA plugin by default when using maven 1.x -if [ -e $out/bin/maven ] +if [ -e $out/maven/bin/maven ] then export OLD_HOME=$HOME export HOME=. - $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 + $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7 export HOME=OLD_HOME fi