summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-06-01 23:03:36 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-01-01 13:40:16 +0100
commitf364e3f8e8b34cd5fe402f008e02be3acf3a8839 (patch)
treea78f66f99e2e066db725f969fa1d31a91188fb93 /pkgs/applications/editors
parent3878472f02470b5b16ec2f0d7bbd6dcf957c1cb2 (diff)
downloadnixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar.gz
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar.bz2
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar.lz
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar.xz
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.tar.zst
nixlib-f364e3f8e8b34cd5fe402f008e02be3acf3a8839.zip
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).
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/eclipse/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 6073dc42c698..e04e438b8bad 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.