diff options
| -rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/jetbrains-jdk/default.nix | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 92355552fcec..de1f4232f104 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -240,7 +240,7 @@ let patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment - rm -r jre64 + rm -r jbr ''; }); in diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 1349b7f0dddc..24bbb59c7008 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,12 +7,12 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "164"; + version = "451"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz"; - sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi"; + url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz"; + sha256 = "05khf817i8lywfdp68a6lniv8hgi20rmnxqp3963k6vw41ar9qba"; } else throw "unsupported system: ${stdenv.hostPlatform.system}"; @@ -24,8 +24,7 @@ let drv = stdenv.mkDerivation rec { installPhase = '' cd .. - mv $sourceRoot $out - jrePath=$out/jre + mv $sourceRoot/jbrsdk $out ''; postFixup = '' |