summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMatt McHenry <github@matt.mchenryfamily.org>2018-03-07 15:29:51 -0500
committerMatt McHenry <github@matt.mchenryfamily.org>2018-04-03 12:30:21 -0400
commitcb66a7468e44fd4df745fb10f8c81e3d25229d36 (patch)
tree9762b19483c9e7b5957177d79ca40e21c62f3ece /pkgs/top-level
parent2bd7c3a906685884bfcc5996159da2d37c93b200 (diff)
downloadnixlib-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/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 969f94b5cde7..652434d96f68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15236,7 +15236,9 @@ with pkgs;
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; });
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
+    jdk = jdk10;
+  });
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };