diff options
author | Linus Heckemann <git@sphalerite.org> | 2019-04-25 13:55:05 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2019-04-25 14:55:24 +0200 |
commit | bbb12122088ecf0a7f369d72ea257165e40669d6 (patch) | |
tree | dd77722d37eb3946b7da7cf95038d77d5693e80d | |
parent | 5aa04754e568a41353548bc8a9e0d299e7bfb201 (diff) | |
download | nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar.gz nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar.bz2 nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar.lz nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar.xz nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.tar.zst nixpkgs-bbb12122088ecf0a7f369d72ea257165e40669d6.zip |
jetbrains-jdk: 8.202b1483.37 -> 11.0.2b164
-rw-r--r-- | pkgs/development/compilers/jetbrains-jdk/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 62934dd9eeb..08e3ec4f445 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt , libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo -, gdk_pixbuf, atk }: +, gdk_pixbuf, atk, zlib }: # TODO: Investigate building from source instead of patching binaries. # TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "202b1483.37"; + version = "164"; name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz"; - sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7"; + url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz"; + sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi"; } else throw "unsupported system: ${stdenv.hostPlatform.system}"; @@ -29,16 +29,7 @@ let drv = stdenv.mkDerivation rec { jrePath=$out/jre ''; - postFixup = let - arch = "amd64"; - rSubPaths = [ - "lib/${arch}/jli" - "lib/${arch}/server" - "lib/${arch}/xawt" - "lib/${arch}" - ]; - in '' - rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" + postFixup = '' find $out -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; @@ -47,10 +38,11 @@ let drv = stdenv.mkDerivation rec { rpath = lib.makeLibraryPath ([ stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL - alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk + alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib + (placeholder "out") ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm - ])); + ])) + ":${placeholder "out"}/lib/jli"; passthru.home = drv; |