diff options
Diffstat (limited to 'pkgs/applications/editors/jetbrains/source/build.nix')
-rw-r--r-- | pkgs/applications/editors/jetbrains/source/build.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index cba986c61039..a9d509128f87 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -6,6 +6,7 @@ , runCommand , stdenv , stdenvNoCC +, rustPlatform , ant , cmake @@ -23,6 +24,7 @@ , ideaHash , androidHash , jpsHash +, restarterHash , mvnDeps }: @@ -109,6 +111,15 @@ let ''; }; + restarter = rustPlatform.buildRustPackage { + pname = "restarter"; + version = buildVer; + inherit src; + patches = [ ../patches/restarter-no-static-crt-override.patch ]; + sourceRoot = "source/native/restarter"; + cargoHash = restarterHash; + }; + jpsRepo = runCommand "jps-bootstrap-repository" { outputHashAlgo = "sha256"; @@ -163,6 +174,7 @@ let "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/${entry.url}" "https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2/${entry.url}" "https://packages.jetbrains.team/maven/p/kpm/public/${entry.url}" + "https://packages.jetbrains.team/maven/p/ki/maven/${entry.url}" "https://packages.jetbrains.team/maven/p/dpgpv/maven/${entry.url}" "https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository/${entry.url}" ]; @@ -176,11 +188,11 @@ let repoUrl = "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies"; groupId = builtins.replaceStrings [ "." ] [ "/" ] "org.jetbrains.kotlin"; artefactId = "kotlin-jps-plugin-classpath"; - version = "1.8.20"; + version = "1.9.10"; in fetchurl { url = repoUrl + "/" + groupId + "/" + artefactId + "/" + version + "/" + artefactId + "-" + version + ".jar"; - hash = "sha256-w+vmEBSXGcyvxHB3byIOFjTeCIC7tkWh9rvOoP0//9A="; + hash = "sha256-gpB4lg6wailtxSgPyyOrarXCL9+DszojaYGC4ULgU3c="; }; targetClass = if buildType == "pycharm" then "intellij.pycharm.community.build" else "intellij.idea.community.build"; @@ -197,10 +209,11 @@ stdenvNoCC.mkDerivation rec { patches = [ ../patches/no-download.patch - ../patches/pycharm-build-fix.patch + ../patches/disable-sbom-generation.patch ]; postPatch = '' + cp ${restarter}/bin/restarter bin/linux/amd64/restarter cp ${fsnotifier}/bin/fsnotifier bin/linux/amd64/fsnotifier cp ${libdbm}/lib/libdbm.so bin/linux/amd64/libdbm.so @@ -224,9 +237,6 @@ stdenvNoCC.mkDerivation rec { configurePhase = '' runHook preConfigure - # Will need removing after update - cp plugins/devkit/devkit-core/src/run/OpenedPackages.txt platform/platform-impl/resources/META-INF/OpenedPackages.txt - ln -s "$repo"/.m2 /build/.m2 export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source jps-bootstrap \ |