public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jetbrains.jdk: 164 -> 451

Browse Source
This commit is contained in:
Edmund Wu 2019-08-29 15:13:44 -04:00
parent e0795aa5e8
commit 925abd008b
No known key found for this signature in database
GPG Key ID: 76AA3F9F2BD3E3A0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/jetbrains/default.nix
View File

@ -240,7 +240,7 @@ let
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) ''
# Webstorm tries to use bundled jre if available. # Webstorm tries to use bundled jre if available.
# Lets prevent this for the moment # Lets prevent this for the moment
rm -r jre64 rm -r jbr
''; '';
}); });
in in

9
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@ -7,12 +7,12 @@
let drv = stdenv.mkDerivation rec { let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk"; pname = "jetbrainsjdk";
version = "164"; version = "451";
src = if stdenv.hostPlatform.system == "x86_64-linux" then src = if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz"; url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_4-linux-x64-b${version}.tar.gz";
sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi"; sha256 = "05khf817i8lywfdp68a6lniv8hgi20rmnxqp3963k6vw41ar9qba";
} }
else else
throw "unsupported system: ${stdenv.hostPlatform.system}"; throw "unsupported system: ${stdenv.hostPlatform.system}";
@ -24,8 +24,7 @@ let drv = stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
cd .. cd ..
mv $sourceRoot $out mv $sourceRoot/jbrsdk $out
jrePath=$out/jre
''; '';
postFixup = '' postFixup = ''