From 183d5dc84f81f711d51498cc9e95f4b7eacaac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20=22Capypara=22=20K=C3=B6pcke?= Date: Mon, 22 Dec 2025 20:40:52 +0100 Subject: [PATCH] jetbrains.*-oss: Do not use hardcoded build dir paths Co-Authored-By: Matt Sturgeon --- .../applications/editors/jetbrains/source/build.nix | 13 +++++++------ .../editors/jetbrains/source/jps_repo.nix | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index ed8deca314cf..f7ff7a72cc8f 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -152,7 +152,8 @@ let buildPhase = '' runHook preBuild - ant -Duser.home=${jpsRepo} -Dbuild.dir=/build/out -f jps-bootstrap-classpath.xml + BUILD_HOME=$(mktemp -d) + ant -Duser.home=${jpsRepo} -Dbuild.dir="$BUILD_HOME" -f jps-bootstrap-classpath.xml runHook postBuild ''; @@ -160,8 +161,8 @@ let runHook preInstall mkdir -p $out/share/java/ - cp /build/out/jps-bootstrap.classes.jar $out/share/java/jps-bootstrap.jar - cp -r /build/out/jps-bootstrap.out.lib $out/share/java/jps-bootstrap-classpath + cp "$BUILD_HOME/jps-bootstrap.classes.jar" $out/share/java/jps-bootstrap.jar + cp -r "$BUILD_HOME/jps-bootstrap.out.lib" $out/share/java/jps-bootstrap-classpath makeWrapper ${jbr}/bin/java $out/bin/jps-bootstrap \ --add-flags "-cp $out/share/java/jps-bootstrap-classpath/'*' org.jetbrains.jpsBootstrap.JpsBootstrapMain" @@ -282,8 +283,8 @@ stdenvNoCC.mkDerivation rec { configurePhase = '' runHook preConfigure - ln -s "$repo"/.m2 /build/.m2 - export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source + ln -s "$repo"/.m2 ../.m2 + export JPS_BOOTSTRAP_COMMUNITY_HOME="$PWD" jps-bootstrap \ -Dbuild.number=${buildNumber} \ -Djps.kotlin.home=${kotlin'} \ @@ -292,7 +293,7 @@ stdenvNoCC.mkDerivation rec { -Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \ -Dintellij.build.unix.snaps=false \ --java-argfile-target=java_argfile \ - /build/source \ + "$PWD" \ ${targetClass} \ ${targetName} diff --git a/pkgs/applications/editors/jetbrains/source/jps_repo.nix b/pkgs/applications/editors/jetbrains/source/jps_repo.nix index 21e95592fb66..017d519eb420 100644 --- a/pkgs/applications/editors/jetbrains/source/jps_repo.nix +++ b/pkgs/applications/editors/jetbrains/source/jps_repo.nix @@ -17,7 +17,7 @@ runCommand "jps-bootstrap-repository" ]; } '' - ant -Duser.home=$out -Dbuild.dir=/build/tmp -f ${src}/platform/jps-bootstrap/jps-bootstrap-classpath.xml + ant -Duser.home=$out -Dbuild.dir=$(mktemp -d) -f ${src}/platform/jps-bootstrap/jps-bootstrap-classpath.xml find $out -type f \( \ -name \*.lastUpdated \ -o -name resolver-status.properties \