diff options
author | Robert Helgesson <robert@rycee.net> | 2017-03-14 11:14:29 +0100 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2017-03-14 20:38:04 +0100 |
commit | 5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4 (patch) | |
tree | a6bac6cb7d4f1531345cb666ae32eb67f3c14b9e /pkgs | |
parent | 4e439b2393945c5a943a1e168dfe90de07a3f634 (diff) | |
download | nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar.gz nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar.bz2 nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar.lz nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar.xz nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.tar.zst nixlib-5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4.zip |
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.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 74707c65b6ca..60bece1fafc4 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,6 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2 +, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -15,7 +17,10 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ + fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + libXrender libXtst makeWrapper zlib + ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2; buildCommand = '' # Unpack tarball. @@ -37,6 +42,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 9271579346aa..8ef855e48c8d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk +, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -12,7 +12,8 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst webkitgtk2 makeWrapper; + jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2 + makeWrapper; }; ### Eclipse CPP |