diff options
| author | Artturi <Artturin@artturin.com> | 2023-10-14 05:55:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 05:55:42 +0300 |
| commit | 10e07e27ef840f496cd28be250cf68956584f13c (patch) | |
| tree | 7ee1e0ede8f36de38c495285127ac4e2350137a7 /pkgs/applications/editors | |
| parent | d263efb2bcc0c355c3295fadd02ebf045daeb25d (diff) | |
| parent | 1b111841756a353e860e8462fd9e4a7094d8815c (diff) | |
| download | nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar.gz nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar.bz2 nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar.lz nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar.xz nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.tar.zst nixpkgs-10e07e27ef840f496cd28be250cf68956584f13c.zip | |
Merge pull request #246622 from GenericNerdyUsername/jetbrains-allow-vmopts-override
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/jetbrains/linux.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index c5490e01b51..4a89ae20285 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -127,8 +127,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ --set-default JETBRAINSCLIENT_JDK "$jdk" \ - --set ${hiName}_JDK "$jdk" \ - --set ${hiName}_VM_OPTIONS ${vmoptsFile} + --set-default ${hiName}_JDK "$jdk" \ + --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} 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 |