Merge pull request #246622 from GenericNerdyUsername/jetbrains-allow-vmopts-override

This commit is contained in:
Artturi 2023-10-14 05:55:42 +03:00 committed by GitHub
commit 10e07e27ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -127,8 +127,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
--set-default ANDROID_JAVA_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \
--set-default JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \
--set-default JETBRAINSCLIENT_JDK "$jdk" \ --set-default JETBRAINSCLIENT_JDK "$jdk" \
--set ${hiName}_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \
--set ${hiName}_VM_OPTIONS ${vmoptsFile} --set-default ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname
echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh