jetbrains.idea-community: fix build (#370350)
This commit is contained in:
@@ -32,6 +32,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
kotlin_2_0_21 = kotlin.overrideAttrs (oldAttrs: {
|
||||
version = "2.0.21";
|
||||
src = fetchurl {
|
||||
url = oldAttrs.src.url;
|
||||
sha256 = "sha256-A1LApFvSL4D2sm5IXNBNqAR7ql3lSGUoH7n4mkp7zyo=";
|
||||
};
|
||||
});
|
||||
|
||||
jbr = jetbrains.jdk-no-jcef-17;
|
||||
|
||||
@@ -147,7 +154,7 @@ let
|
||||
sourceRoot = "${src.name}/platform/jps-bootstrap";
|
||||
nativeBuildInputs = [ ant makeWrapper jbr ];
|
||||
patches = [ ../patches/kotlinc-path.patch ];
|
||||
postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
|
||||
postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin_2_0_21}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";
|
||||
buildPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -234,7 +241,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
substituteInPlace \
|
||||
platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt \
|
||||
--replace-fail 'JPS_PLUGIN_CLASSPATH_HERE' '${kotlin-jps-plugin-classpath}' \
|
||||
--replace-fail 'KOTLIN_PATH_HERE' '${kotlin}'
|
||||
--replace-fail 'KOTLIN_PATH_HERE' '${kotlin_2_0_21}'
|
||||
substituteInPlace \
|
||||
platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt \
|
||||
--replace-fail 'JDK_PATH_HERE' '${jbr}/lib/openjdk'
|
||||
@@ -259,7 +266,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source
|
||||
jps-bootstrap \
|
||||
-Dbuild.number=${buildNumber} \
|
||||
-Djps.kotlin.home=${kotlin} \
|
||||
-Djps.kotlin.home=${kotlin_2_0_21} \
|
||||
-Dintellij.build.target.os=linux \
|
||||
-Dintellij.build.target.arch=x64 \
|
||||
-Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step,sources_archive \
|
||||
@@ -275,7 +282,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook preBuild
|
||||
|
||||
java \
|
||||
-Djps.kotlin.home=${kotlin} \
|
||||
-Djps.kotlin.home=${kotlin_2_0_21} \
|
||||
"@java_argfile"
|
||||
|
||||
runHook postBuild
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kotlin";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
|
||||
sha256 = "sha256-tmmNVyitj57c3QFhfWOAcxkdigMTnMU4o5G043Wa0pc=";
|
||||
};
|
||||
|
||||
@@ -40,4 +40,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ SubhrajyotiSen ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user