Merge pull request #329707 from NikSneMC/fix/216659

jetbrains: fix webstorm vmoptions
This commit is contained in:
Leona Maroni 2024-08-23 14:24:50 +02:00 committed by GitHub
commit 601f5026a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -59,6 +59,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
startupWMClass = wmClass;
};
vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName;
vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts);
nativeBuildInputs = [ makeWrapper patchelf unzip autoPatchelfHook ];
@ -114,7 +115,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
--set-default JETBRAINS_CLIENT_JDK "$jdk" \
--set-default ${hiName}_JDK "$jdk" \
--set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
--set-default ${hiName}_VM_OPTIONS ${vmoptsFile}
--set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile}
ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname
rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/