Unverified Commit 601f5026 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #329707 from NikSneMC/fix/216659

jetbrains: fix webstorm vmoptions
parents 94559f13 f78ebd9c
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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/