summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2018-04-05 08:05:55 -0400
committerGitHub <noreply@github.com>2018-04-05 08:05:55 -0400
commit59ddb3ebfbe43625a36d4863739280cedf88c404 (patch)
tree952452b798662af757404ad6559e59583ccf3011 /pkgs/top-level
parent650d8c93a16333e9390db0269327bd2d47f02fc7 (diff)
parentcb66a7468e44fd4df745fb10f8c81e3d25229d36 (diff)
downloadnixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.gz
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.bz2
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.lz
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.xz
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.tar.zst
nixlib-59ddb3ebfbe43625a36d4863739280cedf88c404.zip
Merge pull request #38397 from jerith666/eclipse-jdk10-gtk3
Update OpenJDK 10 and Eclipse to GTK 3
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 86611f44474a..bcbdbae1e697 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15241,7 +15241,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 { };