From f364e3f8e8b34cd5fe402f008e02be3acf3a8839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 1 Jun 2014 23:03:36 +0200 Subject: [PATCH] eclipse: add webkit as dependency This makes the Eclipse internal web browser work. The internal web browser is the default browser, and Eclipse requires manual configuration for any other (external) web browser. To me this means the internal browser should be working by default, unless users will get an error popup if they click any links. This change increases the closure size from 714 to 880 MiB (attribute eclipses.eclipse_cpp_43). --- pkgs/applications/editors/eclipse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 6073dc42c69..e04e438b8ba 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib , glib, gtk, libXtst, jre +, webkitgtk2 ? null # for internal web browser }: assert stdenv ? glibc; @@ -44,7 +45,7 @@ let makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jre}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib \ + --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item.