eclipses: add dependencies as build inputs

Having `glib` in the build inputs will allow its build hook to
trigger. Also adds `gsettings_desktop_schemas` as a dependency since
Eclipse appears to need the schemas under certain circumstances.

+11 -4
+8 -2
pkgs/applications/editors/eclipse/build-eclipse.nix
··· 1 - { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: 2 3 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: 4 ··· 15 categories = "Application;Development;"; 16 }; 17 18 - buildInputs = [ makeWrapper ]; 19 20 buildCommand = '' 21 # Unpack tarball. ··· 37 makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ 38 --prefix PATH : ${jdk}/bin \ 39 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ 40 --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" 41 42 # Create desktop item.
··· 1 + { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender 2 + , zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2 3 + , makeWrapper, ... }: 4 5 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: 6 ··· 17 categories = "Application;Development;"; 18 }; 19 20 + buildInputs = [ 21 + fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 22 + libXrender libXtst makeWrapper zlib 23 + ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2; 24 25 buildCommand = '' 26 # Unpack tarball. ··· 42 makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ 43 --prefix PATH : ${jdk}/bin \ 44 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ 45 + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 46 --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" 47 48 # Create desktop item.
+3 -2
pkgs/applications/editors/eclipse/default.nix
··· 1 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper 2 , freetype, fontconfig, libX11, libXext, libXrender, zlib 3 - , glib, gtk2, libXtst, jdk 4 , webkitgtk2 ? null # for internal web browser 5 , buildEnv, writeText, runCommand 6 , callPackage ··· 12 13 buildEclipse = import ./build-eclipse.nix { 14 inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib 15 - jdk glib gtk2 libXtst webkitgtk2 makeWrapper; 16 }; 17 18 ### Eclipse CPP
··· 1 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper 2 , freetype, fontconfig, libX11, libXext, libXrender, zlib 3 + , glib, gtk2, libXtst, jdk, gsettings_desktop_schemas 4 , webkitgtk2 ? null # for internal web browser 5 , buildEnv, writeText, runCommand 6 , callPackage ··· 12 13 buildEclipse = import ./build-eclipse.nix { 14 inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib 15 + jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2 16 + makeWrapper; 17 }; 18 19 ### Eclipse CPP