diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-03-07 15:29:51 -0500 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2018-04-03 12:30:21 -0400 |
| commit | cb66a7468e44fd4df745fb10f8c81e3d25229d36 (patch) | |
| tree | 9762b19483c9e7b5957177d79ca40e21c62f3ece /pkgs/applications/editors | |
| parent | 2bd7c3a906685884bfcc5996159da2d37c93b200 (diff) | |
| download | nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar.gz nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar.bz2 nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar.lz nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar.xz nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.tar.zst nixlib-cb66a7468e44fd4df745fb10f8c81e3d25229d36.zip | |
eclipse: jdk8 -> jdk10
in combination with the parent commit that makes jdk10 use gtk3, this lets us get onto a current webkitgtk. since the current version of webkitgtk is still receiving security updates, this also reverts 49ea0e27363e5ab5cb3b4e86f6531e799e43dabd "eclipse: Do not use webkitgtk2 by default".
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 23e4449ee2eb..a26d380ec1df 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; + ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index c69686a0967d..1688e606222d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas -, webkitgtk24x-gtk2 ? null # for internal web browser +, glib, gtk3, libXtst, jdk, gsettings-desktop-schemas +, webkitgtk ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage }: @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 + jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; |